diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2022-06-01 12:31:09 +0300 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2022-06-01 12:42:04 +0300 |
commit | 64c043e63a4be97f59fd1906c47973a74eedda67 (patch) | |
tree | 37b15dfb4830e4f874edca87b521b6e9cdc3c81b /guix/bzr-download.scm | |
parent | b1f763de54dc2b8e240d0f01f7948ce76f67243e (diff) | |
parent | 75af73e1b7ac58770122d8831faa3a8158638bb0 (diff) | |
download | guix-patches-64c043e63a4be97f59fd1906c47973a74eedda67.tar guix-patches-64c043e63a4be97f59fd1906c47973a74eedda67.tar.gz |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'guix/bzr-download.scm')
-rw-r--r-- | guix/bzr-download.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guix/bzr-download.scm b/guix/bzr-download.scm index 010e0decff..d97f84838e 100644 --- a/guix/bzr-download.scm +++ b/guix/bzr-download.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2017, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,7 +48,7 @@ (define (bzr-package) "Return the default Bazaar package." (let ((distro (resolve-interface '(gnu packages version-control)))) - (module-ref distro 'bazaar))) + (module-ref distro 'breezy))) (define* (bzr-fetch ref hash-algo hash #:optional name @@ -64,7 +64,7 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." (use-modules (guix build bzr)) (bzr-fetch (getenv "bzr url") (getenv "bzr reference") #$output - #:bzr-command (string-append #+bzr "/bin/bzr"))))) + #:bzr-command (string-append #+bzr "/bin/brz"))))) (mlet %store-monad ((guile (package->derivation guile system))) (gexp->derivation (or name "bzr-branch") build |