diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-05-11 02:03:36 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-05-31 14:54:02 -0400 |
| commit | be672f1f7f0cda28823ef4a4260f39bc845cbabe (patch) | |
| tree | 54de937541d8d519d6b1efbca75950459ad38154 /guix | |
| parent | dc71b4f1c65c9f3244f96aaf69b9218825361eda (diff) | |
gnu: bazaar: Obsolete with breezy.
* gnu/packages/version-control.scm (bazaar): Deprecate package.
* guix/build/bzr.scm (bzr-fetch): Adjust to use breezy; delete trailing #t.
* guix/bzr-download.scm (bzr-package): Replace bazaar by breezy.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/build/bzr.scm | 8 | ||||
| -rw-r--r-- | guix/bzr-download.scm | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/guix/build/bzr.scm b/guix/build/bzr.scm index 86ee11391d..a0f5e15880 100644 --- a/guix/build/bzr.scm +++ b/guix/build/bzr.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2018, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,7 +28,7 @@ ;;; Code: (define* (bzr-fetch url revision directory - #:key (bzr-command "bzr")) + #:key (bzr-command "brz")) "Fetch REVISION from URL into DIRECTORY. REVISION must be a valid Bazaar revision identifier. Return #t on success, else throw an exception." ;; Do not attempt to write .bzr.log to $HOME, which doesn't exist. @@ -37,8 +37,6 @@ revision identifier. Return #t on success, else throw an exception." (invoke bzr-command "-Ossl.cert_reqs=none" "checkout" "--lightweight" "-r" revision url directory) (with-directory-excursion directory - (begin - (delete-file-recursively ".bzr") - #t))) + (delete-file-recursively ".bzr"))) ;;; bzr.scm ends here 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 |