aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/package-management.scm
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2018-04-30 04:03:54 -0400
committerMark H Weaver <mhw@netris.org>2018-04-30 04:03:54 -0400
commit3d5ad159b336a9903b31d0be7ae052dbc8d5bfcc (patch)
treeee7dce4e436490a1db5f18e4bfad55511d2fff32 /gnu/packages/package-management.scm
parentc77835db04ee20c0afe20600dc8f91a67bc2421e (diff)
parent8c21c64e59d3f4d223d8aeef91f06fdde7de1ab7 (diff)
downloadguix-3d5ad159b336a9903b31d0be7ae052dbc8d5bfcc.tar
guix-3d5ad159b336a9903b31d0be7ae052dbc8d5bfcc.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/package-management.scm')
-rw-r--r--gnu/packages/package-management.scm11
1 files changed, 6 insertions, 5 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 7e35af5dfd..ea90e78547 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
+;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -93,8 +94,8 @@
;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this.
(let ((version "0.14.0")
- (commit "486de7377f25438b0f44fd93f97e9ef822d558b8")
- (revision 10))
+ (commit "ab85cf7185da366da56314c53d8e43276e1cccc4")
+ (revision 11))
(package
(name "guix")
@@ -110,7 +111,7 @@
(commit commit)))
(sha256
(base32
- "12ghbby83w335g7vbg7h52hjaal5l6mc6qmldlx8029340br8h1w"))
+ "1c00yr2vgsdl3kmlbjppyws47ssahamdx88y0wg26x73px71rd19"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
@@ -534,13 +535,13 @@ transactions from C or Python.")
(define-public diffoscope
(package
(name "diffoscope")
- (version "90")
+ (version "93")
(source (origin
(method url-fetch)
(uri (pypi-uri name version))
(sha256
(base32
- "0hhg26vi0z2q4gwklwq4k16hibc4kq16jvyzp6zhr4kspi07wl6i"))))
+ "0g90nf7817jk03hzk36l3hymky4xqs50iynfld3r0in7hffly5nj"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases