diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-01-31 23:32:56 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-01-31 23:32:56 +0100 |
commit | 0747328e317de4bf936fab50e795d1e1523adfc1 (patch) | |
tree | 291d4f07a801b147d64faec31e4394c5cd46ce35 /gnu/packages/package-management.scm | |
parent | df09e1d6e71f68a8fb44bcc9f13e625f9f9701a5 (diff) | |
parent | ff75441fcf0ba1212b0342f933a8999bafe60f03 (diff) | |
download | guix-0747328e317de4bf936fab50e795d1e1523adfc1.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/package-management.scm')
-rw-r--r-- | gnu/packages/package-management.scm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 66712da08c..ef38a6f61a 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -52,6 +52,7 @@ #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) + #:use-module (gnu packages guile-xyz) #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages man) @@ -106,8 +107,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.16.0") - (commit "7ba2b27467a39956f10e2e11061d9569e4b7d632") - (revision 8)) + (commit "4bddd12ad540d45a33a5f9f129b896843dca603f") + (revision 9)) (package (name "guix") @@ -123,7 +124,7 @@ (commit commit))) (sha256 (base32 - "14srgkl0vyr6q7azv76nncp63gngmm71y18ybyj9f6l6s4shbcm4")) + "1abn4ghb25kn0cmr9dbb3q3fxdcc0g2fnnmbrykxv111s6ahdmlw")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -301,9 +302,6 @@ the Nix package manager.") (license license:gpl3+) (properties '((ftp-server . "alpha.gnu.org")))))) -;; Alias for backward compatibility. -(define-public guix-devel guix) - (define-public guix-daemon ;; This package is for internal consumption: it allows us to quickly build ;; the 'guix-daemon' program and use that in (guix self), used by 'guix |