diff options
author | Ludovic Courtès <ludo@gnu.org> | 2016-07-20 11:42:02 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2016-07-20 11:42:17 +0200 |
commit | 7575655212ecfbcd1f04e429c8a7a41f8720d027 (patch) | |
tree | 558982d3cf50ef6b19ef293850de1f485fde66a6 /gnu/packages/package-management.scm | |
parent | 5d4c90ae02f1e0b42d575bba2d828d63aaf79be5 (diff) | |
parent | 5f01078129f4eaa4760a14f22761cf357afb6738 (diff) | |
download | guix-7575655212ecfbcd1f04e429c8a7a41f8720d027.tar guix-7575655212ecfbcd1f04e429c8a7a41f8720d027.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/package-management.scm')
-rw-r--r-- | gnu/packages/package-management.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index f3a1cda149..cd58fde249 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -192,7 +192,8 @@ (propagated-inputs `(("gnutls" ,gnutls) ;for 'guix download' & co. ("guile-json" ,guile-json) - ("geiser" ,geiser))) ;for guix.el + ("geiser" ,geiser) ;for guix.el + ("emacs-magit-popup" ,emacs-magit-popup))) ;for "M-x guix" command (home-page "http://www.gnu.org/software/guix") (synopsis "Functional package manager for installed software packages and versions") @@ -474,13 +475,13 @@ transactions from C or Python.") (define-public diffoscope (package (name "diffoscope") - (version "51") + (version "54") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "18rn6rrwh586228vnaf1nq0wayh19zbvfc0qmnbys6ln2pv2v007")))) + "1dv46ywzcll3mlqgvr48mq7rncizfvsic62c6dd2kdhynb22087n")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases |