Merge branch 'version-0.11.0'
This commit is contained in:
		
						commit
						134f657318
					
				
					 4 changed files with 30 additions and 16 deletions
				
			
		| 
						 | 
					@ -1241,7 +1241,7 @@ programs to authenticate Web servers accessed over HTTPS.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
When using Guix on a foreign distro, you can install this package and
 | 
					When using Guix on a foreign distro, you can install this package and
 | 
				
			||||||
define the relevant environment variables so that packages know where to
 | 
					define the relevant environment variables so that packages know where to
 | 
				
			||||||
look for certificates.  @pxref{X.509 Certificates}, for detailed
 | 
					look for certificates.  @xref{X.509 Certificates}, for detailed
 | 
				
			||||||
information.
 | 
					information.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@subsection Emacs Packages
 | 
					@subsection Emacs Packages
 | 
				
			||||||
| 
						 | 
					@ -7836,7 +7836,7 @@ gexps to introduce job definitions that are passed to mcron
 | 
				
			||||||
  #~(job "5 0 * * *"            ;Vixie cron syntax
 | 
					  #~(job "5 0 * * *"            ;Vixie cron syntax
 | 
				
			||||||
         "guix gc -F 1G"))
 | 
					         "guix gc -F 1G"))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define idutils-jobs
 | 
					(define idutils-job
 | 
				
			||||||
  ;; Update the index database as user "charlie" at 12:15PM
 | 
					  ;; Update the index database as user "charlie" at 12:15PM
 | 
				
			||||||
  ;; and 19:15PM.  This runs from the user's home directory.
 | 
					  ;; and 19:15PM.  This runs from the user's home directory.
 | 
				
			||||||
  #~(job '(next-minute-from (next-hour '(12 19)) '(15))
 | 
					  #~(job '(next-minute-from (next-hour '(12 19)) '(15))
 | 
				
			||||||
| 
						 | 
					@ -7872,7 +7872,7 @@ This is the type of the @code{mcron} service, whose value is an
 | 
				
			||||||
 | 
					
 | 
				
			||||||
This service type can be the target of a service extension that provides
 | 
					This service type can be the target of a service extension that provides
 | 
				
			||||||
it additional job specifications (@pxref{Service Composition}).  In
 | 
					it additional job specifications (@pxref{Service Composition}).  In
 | 
				
			||||||
other words, it is possible to define services that provide addition
 | 
					other words, it is possible to define services that provide additional
 | 
				
			||||||
mcron jobs to run.
 | 
					mcron jobs to run.
 | 
				
			||||||
@end defvr
 | 
					@end defvr
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,7 @@
 | 
				
			||||||
# htmlxref.cnf - reference file for free Texinfo manuals on the web.
 | 
					# htmlxref.cnf - reference file for free Texinfo manuals on the web.
 | 
				
			||||||
# Modified by Ludovic Courtès <ludo@gnu.org> for the GNU Guix manual.
 | 
					# Modified by Ludovic Courtès <ludo@gnu.org> for the GNU Guix manual.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
htmlxrefversion=2016-03-30.07; # UTC
 | 
					htmlxrefversion=2016-08-03.13; # UTC
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Copyright 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
 | 
					# Copyright 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
 | 
				
			||||||
# 
 | 
					# 
 | 
				
			||||||
| 
						 | 
					@ -224,6 +224,9 @@ emacs-muse	node	${GS}/emacs-muse/manual/html_node/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
emms		node	${GS}/emms/manual/
 | 
					emms		node	${GS}/emms/manual/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# The file is called 'find.info' but the package is 'findutils'.
 | 
				
			||||||
 | 
					find		mono	${GS}/findutils/manual/html_mono/find.html
 | 
				
			||||||
 | 
					find		node	${GS}/findutils/manual/html_node/find_html
 | 
				
			||||||
findutils	mono	${GS}/findutils/manual/html_mono/find.html
 | 
					findutils	mono	${GS}/findutils/manual/html_mono/find.html
 | 
				
			||||||
findutils	node	${GS}/findutils/manual/html_node/find_html
 | 
					findutils	node	${GS}/findutils/manual/html_node/find_html
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -468,6 +471,9 @@ mailutils	node	${GS}/mailutils/manual/html_node/
 | 
				
			||||||
make		mono	${GS}/make/manual/make.html
 | 
					make		mono	${GS}/make/manual/make.html
 | 
				
			||||||
make		node	${GS}/make/manual/html_node/
 | 
					make		node	${GS}/make/manual/html_node/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					mcron		mono	${GS}/mcron/manual/mcron.html
 | 
				
			||||||
 | 
					mcron		node	${GS}/mcron/manual/html_node/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
mdk		mono	${GS}/mdk/manual/mdk.html
 | 
					mdk		mono	${GS}/mdk/manual/mdk.html
 | 
				
			||||||
mdk		node	${GS}/mdk/manual/html_node/
 | 
					mdk		node	${GS}/mdk/manual/html_node/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2363,7 +2363,15 @@ MPEG-2 and audio over Linux IEEE 1394.")
 | 
				
			||||||
                     (substitute* "udev-md-raid-arrays.rules"
 | 
					                     (substitute* "udev-md-raid-arrays.rules"
 | 
				
			||||||
                       (("/usr/bin/(readlink|basename)" all program)
 | 
					                       (("/usr/bin/(readlink|basename)" all program)
 | 
				
			||||||
                        (string-append coreutils "/bin/" program)))))
 | 
					                        (string-append coreutils "/bin/" program)))))
 | 
				
			||||||
                 (alist-delete 'configure %standard-phases))
 | 
					                 (alist-cons-before
 | 
				
			||||||
 | 
					                  'build 'remove-W-error
 | 
				
			||||||
 | 
					                  (lambda _
 | 
				
			||||||
 | 
					                    ;; We cannot build with -Werror on i686 due to a
 | 
				
			||||||
 | 
					                    ;; 'sign-compare' warning in util.c.
 | 
				
			||||||
 | 
					                    (substitute* "Makefile"
 | 
				
			||||||
 | 
					                      (("-Werror") ""))
 | 
				
			||||||
 | 
					                    #t)
 | 
				
			||||||
 | 
					                  (alist-delete 'configure %standard-phases)))
 | 
				
			||||||
       ;;tests must be done as root
 | 
					       ;;tests must be done as root
 | 
				
			||||||
       #:tests? #f))
 | 
					       #:tests? #f))
 | 
				
			||||||
    (home-page "http://neil.brown.name/blog/mdadm")
 | 
					    (home-page "http://neil.brown.name/blog/mdadm")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -67,17 +67,17 @@
 | 
				
			||||||
                     arch "-linux"
 | 
					                     arch "-linux"
 | 
				
			||||||
                     "/20131110/guile-2.0.9.tar.xz")))
 | 
					                     "/20131110/guile-2.0.9.tar.xz")))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public guix-0.10.0
 | 
					(define-public guix-0.11.0
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "guix")
 | 
					    (name "guix")
 | 
				
			||||||
    (version "0.10.0")
 | 
					    (version "0.11.0")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
             (method url-fetch)
 | 
					             (method url-fetch)
 | 
				
			||||||
             (uri (string-append "ftp://alpha.gnu.org/gnu/guix/guix-"
 | 
					             (uri (string-append "ftp://alpha.gnu.org/gnu/guix/guix-"
 | 
				
			||||||
                                 version ".tar.gz"))
 | 
					                                 version ".tar.gz"))
 | 
				
			||||||
             (sha256
 | 
					             (sha256
 | 
				
			||||||
              (base32
 | 
					              (base32
 | 
				
			||||||
               "0d4afwy7bpqi4k4bzvwc4ga4shwssis1nrvdw53qjyg9bw1a8lbn"))))
 | 
					               "1cwrbpv4dq7aczwksmcfw9w8r2bzrb5ld9zvjcr90i804hjpcb93"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     `(#:configure-flags (list
 | 
					     `(#:configure-flags (list
 | 
				
			||||||
| 
						 | 
					@ -212,9 +212,9 @@ the Nix package manager.")
 | 
				
			||||||
  ;;
 | 
					  ;;
 | 
				
			||||||
  ;; Note: use a very short commit id; with a longer one, the limit on
 | 
					  ;; Note: use a very short commit id; with a longer one, the limit on
 | 
				
			||||||
  ;; hash-bang lines would be exceeded while running the tests.
 | 
					  ;; hash-bang lines would be exceeded while running the tests.
 | 
				
			||||||
  (let ((commit "97c8aef15de89799ac01b62dd9b91245c23eefcb"))
 | 
					  (let ((commit "4420940f20a2f36f29519f686bca7b85be6be5c9"))
 | 
				
			||||||
    (package (inherit guix-0.10.0)
 | 
					    (package (inherit guix-0.11.0)
 | 
				
			||||||
      (version (string-append "0.10.0-1." (string-take commit 4)))
 | 
					      (version (string-append "0.11.0-1." (string-take commit 4)))
 | 
				
			||||||
      (source (origin
 | 
					      (source (origin
 | 
				
			||||||
                (method git-fetch)
 | 
					                (method git-fetch)
 | 
				
			||||||
                (uri (git-reference
 | 
					                (uri (git-reference
 | 
				
			||||||
| 
						 | 
					@ -224,10 +224,10 @@ the Nix package manager.")
 | 
				
			||||||
                      (commit commit)))
 | 
					                      (commit commit)))
 | 
				
			||||||
                (sha256
 | 
					                (sha256
 | 
				
			||||||
                 (base32
 | 
					                 (base32
 | 
				
			||||||
                  "0sdxq87mbvig7785gzf52ywmvl3p1q1qgsczmkzrlw988xkma1dr"))
 | 
					                  "1c1rqsfc4vrclkk03aj1m8r1lzk9pfa61ax9hhhj5nw23bilsixc"))
 | 
				
			||||||
                (file-name (string-append "guix-" version "-checkout"))))
 | 
					                (file-name (string-append "guix-" version "-checkout"))))
 | 
				
			||||||
      (arguments
 | 
					      (arguments
 | 
				
			||||||
       (substitute-keyword-arguments (package-arguments guix-0.10.0)
 | 
					       (substitute-keyword-arguments (package-arguments guix-0.11.0)
 | 
				
			||||||
         ((#:configure-flags flags)
 | 
					         ((#:configure-flags flags)
 | 
				
			||||||
          ;; Set 'DOT_USER_PROGRAM' to the empty string so we don't keep a
 | 
					          ;; Set 'DOT_USER_PROGRAM' to the empty string so we don't keep a
 | 
				
			||||||
          ;; reference to Graphviz, whose closure is pretty big (too big for
 | 
					          ;; reference to Graphviz, whose closure is pretty big (too big for
 | 
				
			||||||
| 
						 | 
					@ -251,7 +251,7 @@ the Nix package manager.")
 | 
				
			||||||
         ("texinfo" ,texinfo)
 | 
					         ("texinfo" ,texinfo)
 | 
				
			||||||
         ("graphviz" ,graphviz)
 | 
					         ("graphviz" ,graphviz)
 | 
				
			||||||
         ("help2man" ,help2man)
 | 
					         ("help2man" ,help2man)
 | 
				
			||||||
         ,@(package-native-inputs guix-0.10.0))))))
 | 
					         ,@(package-native-inputs guix-0.11.0))))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public guix guix-devel)
 | 
					(define-public guix guix-devel)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue