mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 05:57:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Rename "guile-next" to "guile".

Browse source 
* gnu/packages/guile.scm (guile-next): Rename to...
(guile-2.2): ... this.  Update users.
[name]: Change to "guile".
[synopsis]: Remove.
[properties]: Remove 'upstream-name', 'ftp-server', and
'ftp-directory'.
* gnu/packages/bioinformatics.scm (rcas-web): Update accordingly.
* gnu/packages/tls.scm (gnutls/guile-2.2): Likewise.
* tests/guix-build.sh: Use 'guile@2.2' instead of 'guile-next'.
* doc/guix.texi (Package Transformation Options): Update examples that
referred to "guile-next".
This commit is contained in:
Ludovic Courtès 2017-03-19 17:30:44 +01:00
parent 8df672aad5
commit f6396d862f
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
5 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/guix.texi
View file

@ -4921,15 +4921,15 @@ or @code{guile@@1.8}.
For instance, the following command builds Guix, but replaces its For instance, the following command builds Guix, but replaces its
dependency on the current stable version of Guile with a dependency on dependency on the current stable version of Guile with a dependency on
the development version of Guile, @code{guile-next}: the legacy version of Guile, @code{guile@@2.0}:
@example @example
guix build --with-input=guile=guile-next guix guix build --with-input=guile=guile@@2.0 guix
@end example @end example
This is a recursive, deep replacement. So in this example, both This is a recursive, deep replacement. So in this example, both
@code{guix} and its dependency @code{guile-json} (which also depends on @code{guix} and its dependency @code{guile-json} (which also depends on
@code{guile}) get rebuilt against @code{guile-next}. @code{guile}) get rebuilt against @code{guile@@2.0}.
This is implemented using the @code{package-input-rewriting} Scheme This is implemented using the @code{package-input-rewriting} Scheme
procedure (@pxref{Defining Packages, @code{package-input-rewriting}}). procedure (@pxref{Defining Packages, @code{package-input-rewriting}}).

2
gnu/packages/bioinformatics.scm
View file

@ -7638,7 +7638,7 @@ (define-public rcas-web
(inputs (inputs
`(("r-minimal" ,r-minimal) `(("r-minimal" ,r-minimal)
("r-rcas" ,r-rcas) ("r-rcas" ,r-rcas)
("guile-next" ,guile-next) ("guile-next" ,guile-2.2)
("guile-json" ,guile2.2-json) ("guile-json" ,guile2.2-json)
("guile-redis" ,guile2.2-redis))) ("guile-redis" ,guile2.2-redis)))
(native-inputs (native-inputs

26
gnu/packages/guile.scm
View file

@ -231,9 +231,9 @@ (define guile-2.0.13
"12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p")) "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p"))
(patches (search-patches "guile-repl-server-test.patch")))))) (patches (search-patches "guile-repl-server-test.patch"))))))
(define-public guile-next (define-public guile-2.2
(package (inherit guile-2.0) (package (inherit guile-2.0)
(name "guile-next") (name "guile")
(version "2.2.0") (version "2.2.0")
(replacement #f) (replacement #f)
(source (origin (source (origin
@ -250,12 +250,8 @@ (define-public guile-next
;; times (almost 3 hours on a 4-core Intel i5). ;; times (almost 3 hours on a 4-core Intel i5).
(snippet '(for-each delete-file (snippet '(for-each delete-file
(find-files "prebuilt" "\\.go$"))))) (find-files "prebuilt" "\\.go$")))))
(synopsis "Snapshot of what will become version 2.2 of GNU Guile")
(properties '((timeout . 72000) ;20 hours (properties '((timeout . 72000) ;20 hours
(max-silent-time . 10800) ;3 hours (needed on ARM) (max-silent-time . 10800))) ;3 hours (needed on ARM)
(upstream-name . "guile")
(ftp-server . "alpha.gnu.org")
(ftp-directory . "/gnu/guile")))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "GUILE_LOAD_PATH") (variable "GUILE_LOAD_PATH")
@ -276,12 +272,12 @@ (define (guile-2.2-package-name name)
(define package-for-guile-2.2 (define package-for-guile-2.2
;; A procedure that rewrites the dependency tree of the given package to use ;; A procedure that rewrites the dependency tree of the given package to use
;; GUILE-NEXT instead of GUILE-2.0. ;; GUILE-2.2 instead of GUILE-2.0.
(package-input-rewriting `((,guile-2.0 . ,guile-next)) (package-input-rewriting `((,guile-2.0 . ,guile-2.2))
guile-2.2-package-name)) guile-2.2-package-name))
(define-public guile-for-guile-emacs (define-public guile-for-guile-emacs
(package (inherit guile-next) (package (inherit guile-2.2)
(name "guile-for-guile-emacs") (name "guile-for-guile-emacs")
(version "20150510.d8d9a8d") (version "20150510.d8d9a8d")
(source (origin (source (origin
@ -296,7 +292,7 @@ (define-public guile-for-guile-emacs
(substitute-keyword-arguments `(;; Tests aren't passing for now. (substitute-keyword-arguments `(;; Tests aren't passing for now.
;; Obviously we should re-enable this! ;; Obviously we should re-enable this!
#:tests? #f #:tests? #f
,@(package-arguments guile-next)) ,@(package-arguments guile-2.2))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'unpack 'autogen (add-after 'unpack 'autogen
@ -314,7 +310,7 @@ (define-public guile-for-guile-emacs
("flex" ,flex) ("flex" ,flex)
("texinfo" ,texinfo) ("texinfo" ,texinfo)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
,@(package-native-inputs guile-next))) ,@(package-native-inputs guile-2.2)))
;; Same as in guile-2.0 ;; Same as in guile-2.0
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
@ -1641,7 +1637,7 @@ (define-public guile-8sync
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("autoconf" ,autoconf) (native-inputs `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("guile" ,guile-next) ("guile" ,guile-2.2)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("texinfo" ,texinfo))) ("texinfo" ,texinfo)))
(arguments (arguments
@ -1657,7 +1653,7 @@ (define-public guile-8sync
"GNU 8sync (pronounced \"eight-sync\") is an asynchronous programming "GNU 8sync (pronounced \"eight-sync\") is an asynchronous programming
library for GNU Guile based on the actor model. library for GNU Guile based on the actor model.
Note that 8sync is only available for Guile 2.2 (guile-next in Guix).") Note that 8sync is only available for Guile 2.2.")
(license license:lgpl3+))) (license license:lgpl3+)))
(define-public guile-fibers (define-public guile-fibers
@ -1676,7 +1672,7 @@ (define-public guile-fibers
`(("texinfo" ,texinfo) `(("texinfo" ,texinfo)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
`(("guile" ,guile-next))) `(("guile" ,guile-2.2)))
(synopsis "Lightweight concurrency facility for Guile") (synopsis "Lightweight concurrency facility for Guile")
(description (description
"Fibers is a Guile library that implements a a lightweight concurrency "Fibers is a Guile library that implements a a lightweight concurrency

2
gnu/packages/tls.scm
View file

@ -238,7 +238,7 @@ (define-public gnutls/guile-2.2
(substitute-keyword-arguments (package-arguments gnutls-3.5.8) (substitute-keyword-arguments (package-arguments gnutls-3.5.8)
((#:configure-flags flags) ((#:configure-flags flags)
`(cdr ,flags)))) `(cdr ,flags))))
(inputs `(("guile" ,guile-next) (inputs `(("guile" ,guile-2.2)
,@(alist-delete "guile" (package-inputs gnutls-3.5.8)))))) ,@(alist-delete "guile" (package-inputs gnutls-3.5.8))))))
(define-public openssl (define-public openssl

4
tests/guix-build.sh
View file

@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU # GNU Guix --- Functional package management for GNU
# Copyright © 2012, 2013, 2014, 2016 Ludovic Courtès <ludo@gnu.org> # Copyright © 2012, 2013, 2014, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
# #
# This file is part of GNU Guix. # This file is part of GNU Guix.
# #
@ -160,7 +160,7 @@ rm -f "$result"
guix build coreutils --target=mips64el-linux-gnu --dry-run --no-substitutes guix build coreutils --target=mips64el-linux-gnu --dry-run --no-substitutes
# Replacements. # Replacements.
drv1=`guix build guix --with-input=guile=guile-next -d` drv1=`guix build guix --with-input=guile@2.0=guile@2.2 -d`
drv2=`guix build guix -d` drv2=`guix build guix -d`
test "$drv1" != "$drv2" test "$drv1" != "$drv2"