aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2017-05-22 18:25:01 +0200
committerMarius Bakke <mbakke@fastmail.com>2017-05-22 18:25:01 +0200
commitfd3782d13b8f2e835e9867c7abd92786a93e8ad6 (patch)
tree6259124b015fcee06d6777f0a348da0fce34892f /gnu
parent52d2a2be1fda52991a19519bc260f25655bfb1ab (diff)
parent7c63fff6d0ba1dcd74e1a31c13b501d24d9c66f6 (diff)
downloadpatches-fd3782d13b8f2e835e9867c7abd92786a93e8ad6.tar
patches-fd3782d13b8f2e835e9867c7abd92786a93e8ad6.tar.gz
Merge branch 'version-0.13.0'
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/package-management.scm8
-rw-r--r--gnu/tests/ssh.scm2
2 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 3438d370e0..12e1f9e6c0 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -73,9 +73,9 @@
;; Latest version of Guix, which may or may not correspond to a release.
;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this.
- (let ((version "0.12.0")
- (commit "ce92d269fea0a2bfac0ac20414f77127d2f07500")
- (revision 11))
+ (let ((version "0.13.0")
+ (commit "a6d728b7aaee09892b0b420d07ed2dbb7de5e63f")
+ (revision 1))
(package
(name "guix")
@@ -91,7 +91,7 @@
(commit commit)))
(sha256
(base32
- "17l9r2mdzzv8vfxb3bc5zkdqkl472q979iwsarp7lcqss1jxys7w"))
+ "1nrskyk8z6w5i9cdfh5zxfgsrqf744sb30ssqi2g5xhijwagr1yq"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
diff --git a/gnu/tests/ssh.scm b/gnu/tests/ssh.scm
index 02931e982a..5f06151081 100644
--- a/gnu/tests/ssh.scm
+++ b/gnu/tests/ssh.scm
@@ -51,7 +51,7 @@ When SFTP? is true, run an SFTP server test."
(eval-when (expand load eval)
;; Prepare to use Guile-SSH.
(set! %load-path
- (cons (string-append #$guile-ssh "/share/guile/site/"
+ (cons (string-append #+guile2.0-ssh "/share/guile/site/"
(effective-version))
%load-path)))