GNU bug report logs -
#52548
[PATCH] gnu: Add osmium-tool.
Previous Next
Reported by: Nikolay Korotkiy <sikmir <at> gmail.com>
Date: Thu, 16 Dec 2021 11:55:01 UTC
Severity: normal
Tags: patch
Done: Ludovic Courtès <ludo <at> gnu.org>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 52548 in the body.
You can then email your comments to 52548 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org
:
bug#52548
; Package
guix-patches
.
(Thu, 16 Dec 2021 11:55:01 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Nikolay Korotkiy <sikmir <at> gmail.com>
:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org
.
(Thu, 16 Dec 2021 11:55:01 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/geo.scm (osmium-tool): New variable.
---
gnu/packages/geo.scm | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index cb5f4cbc64..63569a3bcf 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -82,6 +82,7 @@ (define-module (gnu packages geo)
#:use-module (gnu packages graphics)
#:use-module (gnu packages gtk)
#:use-module (gnu packages haskell-apps)
+ #:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages image)
#:use-module (gnu packages image-processing)
#:use-module (gnu packages icu4c)
@@ -1198,6 +1199,35 @@ (define-public libosmium
OpenStreetMap data.")
(license license:boost1.0)))
+(define-public osmium-tool
+ (package
+ (name "osmium-tool")
+ (version "1.13.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/osmcode/osmium-tool")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0brifazzwnd4qx234z049wh4ii0a7jy79n8jc2f3ry6jcrijddkl"))))
+ (build-system cmake-build-system)
+ (inputs
+ (list libosmium))
+ (native-inputs
+ (list pandoc))
+ (home-page "https://osmcode.org/osmium-tool/")
+ (synopsis "Osmium Command Line Tool")
+ (description "Command line tool for working with OpenStreetMap data
+based on the Osmium library")
+ (license (list
+ license:gpl3+
+ ;; rapidjson
+ license:expat
+ ;; msinttypes
+ license:bsd-3))))
+
(define-public osm2pgsql
(package
(name "osm2pgsql")
--
2.34.0
Information forwarded
to
guix-patches <at> gnu.org
:
bug#52548
; Package
guix-patches
.
(Thu, 16 Dec 2021 11:57:01 GMT)
Full text and
rfc822 format available.
Message #8 received at 52548 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/geo.scm (libosmium): Update to 2.17.2.
---
gnu/packages/geo.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 02db04e38c..cb5f4cbc64 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1167,7 +1167,7 @@ (define-public imposm3
(define-public libosmium
(package
(name "libosmium")
- (version "2.17.1")
+ (version "2.17.2")
(source
(origin
(method git-fetch)
@@ -1176,7 +1176,7 @@ (define-public libosmium
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0xw71lrw4q4sdm51rl0zg87ywxfkxbw9h52zqim0z0xl5qh5q8xf"))))
+ (base32 "0xgwicnzlyr8pcpgx528xrzh7g6rjfd7f80bi30478fnp8mq8rzr"))))
(build-system cmake-build-system)
(propagated-inputs
(list boost
@@ -1184,6 +1184,7 @@ (define-public libosmium
expat
gdal
geos
+ lz4
proj
protozero
sparsehash
--
2.34.0
Information forwarded
to
guix-patches <at> gnu.org
:
bug#52548
; Package
guix-patches
.
(Thu, 16 Dec 2021 22:50:01 GMT)
Full text and
rfc822 format available.
Message #11 received at 52548 <at> debbugs.gnu.org (full text, mbox):
Thanks for the patch! It looks good to me, but I wonder if we could
unbundle rapidjson and msinttypes? rapidjson is already a guix package,
and I'm not sure where msinttypes is used exactly.
Le Thu, 16 Dec 2021 14:53:46 +0300,
Nikolay Korotkiy <sikmir <at> gmail.com> a écrit :
> * gnu/packages/geo.scm (osmium-tool): New variable.
> ---
> gnu/packages/geo.scm | 30 ++++++++++++++++++++++++++++++
> 1 file changed, 30 insertions(+)
>
> diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
> index cb5f4cbc64..63569a3bcf 100644
> --- a/gnu/packages/geo.scm
> +++ b/gnu/packages/geo.scm
> @@ -82,6 +82,7 @@ (define-module (gnu packages geo)
> #:use-module (gnu packages graphics)
> #:use-module (gnu packages gtk)
> #:use-module (gnu packages haskell-apps)
> + #:use-module (gnu packages haskell-xyz)
> #:use-module (gnu packages image)
> #:use-module (gnu packages image-processing)
> #:use-module (gnu packages icu4c)
> @@ -1198,6 +1199,35 @@ (define-public libosmium
> OpenStreetMap data.")
> (license license:boost1.0)))
>
> +(define-public osmium-tool
> + (package
> + (name "osmium-tool")
> + (version "1.13.2")
> + (source
> + (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/osmcode/osmium-tool")
> + (commit (string-append "v" version))))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32
> "0brifazzwnd4qx234z049wh4ii0a7jy79n8jc2f3ry6jcrijddkl"))))
> + (build-system cmake-build-system)
> + (inputs
> + (list libosmium))
> + (native-inputs
> + (list pandoc))
> + (home-page "https://osmcode.org/osmium-tool/")
> + (synopsis "Osmium Command Line Tool")
> + (description "Command line tool for working with OpenStreetMap
> data +based on the Osmium library")
> + (license (list
> + license:gpl3+
> + ;; rapidjson
> + license:expat
> + ;; msinttypes
> + license:bsd-3))))
> +
> (define-public osm2pgsql
> (package
> (name "osm2pgsql")
Information forwarded
to
guix-patches <at> gnu.org
:
bug#52548
; Package
guix-patches
.
(Thu, 16 Dec 2021 23:04:02 GMT)
Full text and
rfc822 format available.
Message #14 received at 52548 <at> debbugs.gnu.org (full text, mbox):
RapidJSON is header-only library, so it doesn't make much sense to
unbundle it, since upstream authors decided to vendor it. And such
unbundling could complicate maintenance and package expression for no
reason. The same story about msinttypes, RapidJSON vendors msinttypes.
Julien Lepiller kirjoitti 17.12.2021 klo 1.49:
> Thanks for the patch! It looks good to me, but I wonder if we could
> unbundle rapidjson and msinttypes? rapidjson is already a guix package,
> and I'm not sure where msinttypes is used exactly.
>
> Le Thu, 16 Dec 2021 14:53:46 +0300,
> Nikolay Korotkiy <sikmir <at> gmail.com> a écrit :
>
>> * gnu/packages/geo.scm (osmium-tool): New variable.
>> ---
>> gnu/packages/geo.scm | 30 ++++++++++++++++++++++++++++++
>> 1 file changed, 30 insertions(+)
>>
>> diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
>> index cb5f4cbc64..63569a3bcf 100644
>> --- a/gnu/packages/geo.scm
>> +++ b/gnu/packages/geo.scm
>> @@ -82,6 +82,7 @@ (define-module (gnu packages geo)
>> #:use-module (gnu packages graphics)
>> #:use-module (gnu packages gtk)
>> #:use-module (gnu packages haskell-apps)
>> + #:use-module (gnu packages haskell-xyz)
>> #:use-module (gnu packages image)
>> #:use-module (gnu packages image-processing)
>> #:use-module (gnu packages icu4c)
>> @@ -1198,6 +1199,35 @@ (define-public libosmium
>> OpenStreetMap data.")
>> (license license:boost1.0)))
>>
>> +(define-public osmium-tool
>> + (package
>> + (name "osmium-tool")
>> + (version "1.13.2")
>> + (source
>> + (origin
>> + (method git-fetch)
>> + (uri (git-reference
>> + (url "https://github.com/osmcode/osmium-tool")
>> + (commit (string-append "v" version))))
>> + (file-name (git-file-name name version))
>> + (sha256
>> + (base32
>> "0brifazzwnd4qx234z049wh4ii0a7jy79n8jc2f3ry6jcrijddkl"))))
>> + (build-system cmake-build-system)
>> + (inputs
>> + (list libosmium))
>> + (native-inputs
>> + (list pandoc))
>> + (home-page "https://osmcode.org/osmium-tool/")
>> + (synopsis "Osmium Command Line Tool")
>> + (description "Command line tool for working with OpenStreetMap
>> data +based on the Osmium library")
>> + (license (list
>> + license:gpl3+
>> + ;; rapidjson
>> + license:expat
>> + ;; msinttypes
>> + license:bsd-3))))
>> +
>> (define-public osm2pgsql
>> (package
>> (name "osm2pgsql")
>
--
Best regards,
Nikolay
Information forwarded
to
guix-patches <at> gnu.org
:
bug#52548
; Package
guix-patches
.
(Wed, 05 Jan 2022 22:37:01 GMT)
Full text and
rfc822 format available.
Message #17 received at 52548 <at> debbugs.gnu.org (full text, mbox):
Hi,
Nikolay Korotkiy <sikmir <at> gmail.com> skribis:
> RapidJSON is header-only library, so it doesn't make much sense to
> unbundle it,
You’re right that it’s different from the situation of .so files.
However, unbundling still clarifies the dependency graph by making code
reuse visible, and it allows us to make sure a security update in
RapidJSON propagates to all its users, should that happen.
> since upstream authors decided to vendor it. And such unbundling could
> complicate maintenance and package expression for no reason. The same
> story about msinttypes, RapidJSON vendors msinttypes.
Yeah it could complicate things, but in some cases it’s a no-brainer.
Could you give it a try and see whether there are any roadblocks?
Thanks in advance,
Ludo’.
Information forwarded
to
guix-patches <at> gnu.org
:
bug#52548
; Package
guix-patches
.
(Tue, 08 Feb 2022 13:34:03 GMT)
Full text and
rfc822 format available.
Message #20 received at 52548 <at> debbugs.gnu.org (full text, mbox):
From: Nikolay Korotkiy <sikmir <at> gmail.com>
* gnu/packages/geo.scm (osmium-tool): New variable.
---
gnu/packages/geo.scm | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 23cec0f9b7..153e4582bd 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -82,6 +82,7 @@ (define-module (gnu packages geo)
#:use-module (gnu packages graphics)
#:use-module (gnu packages gtk)
#:use-module (gnu packages haskell-apps)
+ #:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages image)
#:use-module (gnu packages image-processing)
#:use-module (gnu packages icu4c)
@@ -1209,6 +1210,37 @@ (define-public libosmium
OpenStreetMap data.")
(license license:boost1.0)))
+(define-public osmium-tool
+ (package
+ (name "osmium-tool")
+ (version "1.14.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/osmcode/osmium-tool")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0zgyqyrs89vch0qnkh9m5xq079sr2wmydy5zz4l8xbysbjf6xry5"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; Remove bundled libraries.
+ '(begin
+ (delete-file-recursively "include/rapidjson")
+ #t))))
+ (build-system cmake-build-system)
+ (inputs
+ (list libosmium
+ rapidjson))
+ (native-inputs
+ (list pandoc))
+ (home-page "https://osmcode.org/osmium-tool/")
+ (synopsis "Osmium Command Line Tool")
+ (description "Command line tool for working with OpenStreetMap data
+based on the Osmium library")
+ (license license:gpl3+)))
+
(define-public osm2pgsql
(package
(name "osm2pgsql")
--
2.34.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#52548
; Package
guix-patches
.
(Tue, 08 Feb 2022 13:34:03 GMT)
Full text and
rfc822 format available.
Message #23 received at 52548 <at> debbugs.gnu.org (full text, mbox):
From: Nikolay Korotkiy <sikmir <at> gmail.com>
* gnu/packages/geo.scm (osmium-tool): New variable.
---
gnu/packages/geo.scm | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 23cec0f9b7..153e4582bd 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -82,6 +82,7 @@ (define-module (gnu packages geo)
#:use-module (gnu packages graphics)
#:use-module (gnu packages gtk)
#:use-module (gnu packages haskell-apps)
+ #:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages image)
#:use-module (gnu packages image-processing)
#:use-module (gnu packages icu4c)
@@ -1209,6 +1210,37 @@ (define-public libosmium
OpenStreetMap data.")
(license license:boost1.0)))
+(define-public osmium-tool
+ (package
+ (name "osmium-tool")
+ (version "1.14.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/osmcode/osmium-tool")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0zgyqyrs89vch0qnkh9m5xq079sr2wmydy5zz4l8xbysbjf6xry5"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; Remove bundled libraries.
+ '(begin
+ (delete-file-recursively "include/rapidjson")
+ #t))))
+ (build-system cmake-build-system)
+ (inputs
+ (list libosmium
+ rapidjson))
+ (native-inputs
+ (list pandoc))
+ (home-page "https://osmcode.org/osmium-tool/")
+ (synopsis "Osmium Command Line Tool")
+ (description "Command line tool for working with OpenStreetMap data
+based on the Osmium library")
+ (license license:gpl3+)))
+
(define-public osm2pgsql
(package
(name "osm2pgsql")
--
2.34.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#52548
; Package
guix-patches
.
(Tue, 08 Feb 2022 13:34:04 GMT)
Full text and
rfc822 format available.
Message #26 received at 52548 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/geo.scm (libosmium): Update to 2.18.0.
---
gnu/packages/geo.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 153e4582bd..abd859d32c 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1179,7 +1179,7 @@ (define-public imposm3
(define-public libosmium
(package
(name "libosmium")
- (version "2.17.2")
+ (version "2.18.0")
(source
(origin
(method git-fetch)
@@ -1188,7 +1188,7 @@ (define-public libosmium
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0xgwicnzlyr8pcpgx528xrzh7g6rjfd7f80bi30478fnp8mq8rzr"))))
+ (base32 "0fh57mpii1ksacwfx5rz213j896aklib53jbybld2i517q2mmxr0"))))
(build-system cmake-build-system)
(propagated-inputs
(list boost
--
2.34.1
Reply sent
to
Ludovic Courtès <ludo <at> gnu.org>
:
You have taken responsibility.
(Wed, 09 Mar 2022 22:10:01 GMT)
Full text and
rfc822 format available.
Notification sent
to
Nikolay Korotkiy <sikmir <at> gmail.com>
:
bug acknowledged by developer.
(Wed, 09 Mar 2022 22:10:02 GMT)
Full text and
rfc822 format available.
Message #31 received at 52548-done <at> debbugs.gnu.org (full text, mbox):
Hi Nikolay,
Nikolay Korotkiy <sikmir <at> disroot.org> skribis:
> From: Nikolay Korotkiy <sikmir <at> gmail.com>
>
> * gnu/packages/geo.scm (osmium-tool): New variable.
[...]
> * gnu/packages/geo.scm (libosmium): Update to 2.18.0.
Finally applied both, thanks!
Ludo’.
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org
.
(Thu, 07 Apr 2022 11:24:05 GMT)
Full text and
rfc822 format available.
This bug report was last modified 2 years and 11 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.