diff options
| author | Marius Bakke <marius@gnu.org> | 2020-11-07 21:33:32 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-11-07 21:33:32 +0100 |
| commit | 32787d652460871a79f99b63230f92759e2e0de2 (patch) | |
| tree | ce883cac0d602b10b7c005755d035a08197e73a9 /gnu/packages/geo.scm | |
| parent | 052939c2f6e36de00a5e756ea29a4cc96884a55d (diff) | |
| parent | c2396ceb6eb30ac87755eb8b39583403b35fbd12 (diff) | |
| download | guix-patches-32787d652460871a79f99b63230f92759e2e0de2.tar guix-patches-32787d652460871a79f99b63230f92759e2e0de2.tar.gz | |
Merge branch 'master' into staging
Conflicts:
gnu/local.mk
gnu/packages/gdb.scm
gnu/packages/lisp-xyz.scm
gnu/packages/web-browsers.scm
Diffstat (limited to 'gnu/packages/geo.scm')
| -rw-r--r-- | gnu/packages/geo.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 09afa658c7..c412ec35b6 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1277,7 +1277,7 @@ to the OSM opening hours specification.") (define-public josm (package (name "josm") - (version "17013") + (version "17084") (source (origin (method svn-fetch) (uri (svn-reference @@ -1286,7 +1286,7 @@ to the OSM opening hours specification.") (recursive? #f))) (sha256 (base32 - "12mcqswjijvx2n7hz7lnx83i3vjr5ib58cazqin10hczcwnd778q")) + "0pl1v0lj6lslnaxlr5isivg97xgnydsp0f491idvf93fi2g5grn5")) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet @@ -2099,6 +2099,7 @@ growing set of geoscientific methods.") ("python" ,python) ("python-chardet" ,python-chardet) ("python-dateutil" ,python-dateutil) + ("python-future" ,python-future) ("python-gdal" ,python-gdal) ("python-jinja2" ,python-jinja2) ("python-numpy" ,python-numpy) |