diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-04-23 19:43:59 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-04-23 19:43:59 +0200 |
commit | 37da4fbe1562583589eeddb4be8e11bece80fd35 (patch) | |
tree | 4d8a454b27e62f9b8d7b0fe641a9f6aa6de2402c /gnu/packages/package-management.scm | |
parent | 73326e742d82b6706333885eca770f7518636b1f (diff) | |
parent | e01bd1a67447c1f2a2b5b03e8ea8fbbccd2cd5bd (diff) | |
download | guix-patches-37da4fbe1562583589eeddb4be8e11bece80fd35.tar guix-patches-37da4fbe1562583589eeddb4be8e11bece80fd35.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/package-management.scm')
-rw-r--r-- | gnu/packages/package-management.scm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 4808687227..6708a761eb 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -110,8 +110,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.16.0") - (commit "d78bfd27bdc449cf93fe4c5497d242c2da1aeac8") - (revision 12)) + (commit "b8b1e4d9a2a976c4cd9933bb6a7451340f17e9ec") + (revision 13)) (package (name "guix") @@ -127,7 +127,7 @@ (commit commit))) (sha256 (base32 - "1i24snn7dq7r8c3mf4waz13k11lglhgvx0zb6xqiqiplmb6f7q6n")) + "1rljn9db8lxajbdcl94a6i7skk4a3rgjs25mxf35hnh0lpipqa03")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -137,9 +137,6 @@ (string-append "--with-bash-completion-dir=" (assoc-ref %outputs "out") "/etc/bash_completion.d") - (string-append "--with-libgcrypt-prefix=" - (assoc-ref %build-inputs - "libgcrypt")) ;; Set 'DOT_USER_PROGRAM' to the empty string so ;; we don't keep a reference to Graphviz, whose |