[bug#52548] [PATCH] gnu: Add osmium-tool.

unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed

* [bug#52548] [PATCH] gnu: Add osmium-tool.
@ 2021-12-16 11:53 Nikolay Korotkiy
  2021-12-16 11:56 ` [bug#52548] [PATCH] gnu: libosmium: Update to 2.17.2 Nikolay Korotkiy
                   ` (4 more replies)
  0 siblings, 5 replies; 9+ messages in thread
From: Nikolay Korotkiy @ 2021-12-16 11:53 UTC (permalink / raw)
  To: 52548; +Cc: Nikolay Korotkiy

* 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





^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [bug#52548] [PATCH] gnu: libosmium: Update to 2.17.2.
  2021-12-16 11:53 [bug#52548] [PATCH] gnu: Add osmium-tool Nikolay Korotkiy
@ 2021-12-16 11:56 ` Nikolay Korotkiy
  2021-12-16 22:49 ` [bug#52548] [PATCH] gnu: Add osmium-tool Julien Lepiller
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 9+ messages in thread
From: Nikolay Korotkiy @ 2021-12-16 11:56 UTC (permalink / raw)
  To: 52548; +Cc: Nikolay Korotkiy

* 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





^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [bug#52548] [PATCH] gnu: Add osmium-tool.
  2021-12-16 11:53 [bug#52548] [PATCH] gnu: Add osmium-tool Nikolay Korotkiy
  2021-12-16 11:56 ` [bug#52548] [PATCH] gnu: libosmium: Update to 2.17.2 Nikolay Korotkiy
@ 2021-12-16 22:49 ` Julien Lepiller
  2021-12-16 23:03   ` Nikolay Korotkiy
  2022-02-08  8:56 ` Nikolay Korotkiy via Guix-patches via
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 9+ messages in thread
From: Julien Lepiller @ 2021-12-16 22:49 UTC (permalink / raw)
  To: Nikolay Korotkiy; +Cc: 52548

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@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")





^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#52548] [PATCH] gnu: Add osmium-tool.
  2021-12-16 22:49 ` [bug#52548] [PATCH] gnu: Add osmium-tool Julien Lepiller
@ 2021-12-16 23:03   ` Nikolay Korotkiy
  2022-01-05 22:36     ` Ludovic Courtès
  0 siblings, 1 reply; 9+ messages in thread
From: Nikolay Korotkiy @ 2021-12-16 23:03 UTC (permalink / raw)
  To: Julien Lepiller; +Cc: 52548

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@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




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#52548] [PATCH] gnu: Add osmium-tool.
  2021-12-16 23:03   ` Nikolay Korotkiy
@ 2022-01-05 22:36     ` Ludovic Courtès
  0 siblings, 0 replies; 9+ messages in thread
From: Ludovic Courtès @ 2022-01-05 22:36 UTC (permalink / raw)
  To: Nikolay Korotkiy; +Cc: 52548, Julien Lepiller

Hi,

Nikolay Korotkiy <sikmir@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’.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#52548] [PATCH] gnu: Add osmium-tool.
  2021-12-16 11:53 [bug#52548] [PATCH] gnu: Add osmium-tool Nikolay Korotkiy
  2021-12-16 11:56 ` [bug#52548] [PATCH] gnu: libosmium: Update to 2.17.2 Nikolay Korotkiy
  2021-12-16 22:49 ` [bug#52548] [PATCH] gnu: Add osmium-tool Julien Lepiller
@ 2022-02-08  8:56 ` Nikolay Korotkiy via Guix-patches via
  2022-02-08  9:00 ` [bug#52548] [PATCH 1/2] " Nikolay Korotkiy via Guix-patches via
  2022-02-08  9:02 ` [bug#52548] [PATCH] gnu: libosmium: Update to 2.18.0 Nikolay Korotkiy via Guix-patches via
  4 siblings, 0 replies; 9+ messages in thread
From: Nikolay Korotkiy via Guix-patches via @ 2022-02-08  8:56 UTC (permalink / raw)
  To: 52548; +Cc: Nikolay Korotkiy

From: Nikolay Korotkiy <sikmir@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





^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [bug#52548] [PATCH 1/2] gnu: Add osmium-tool.
  2021-12-16 11:53 [bug#52548] [PATCH] gnu: Add osmium-tool Nikolay Korotkiy
                   ` (2 preceding siblings ...)
  2022-02-08  8:56 ` Nikolay Korotkiy via Guix-patches via
@ 2022-02-08  9:00 ` Nikolay Korotkiy via Guix-patches via
  2022-03-09 22:09   ` bug#52548: [PATCH] " Ludovic Courtès
  2022-02-08  9:02 ` [bug#52548] [PATCH] gnu: libosmium: Update to 2.18.0 Nikolay Korotkiy via Guix-patches via
  4 siblings, 1 reply; 9+ messages in thread
From: Nikolay Korotkiy via Guix-patches via @ 2022-02-08  9:00 UTC (permalink / raw)
  To: 52548; +Cc: Nikolay Korotkiy

From: Nikolay Korotkiy <sikmir@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





^ permalink raw reply related	[flat|nested] 9+ messages in thread

* bug#52548: [PATCH] gnu: Add osmium-tool.
  2022-02-08  9:00 ` [bug#52548] [PATCH 1/2] " Nikolay Korotkiy via Guix-patches via
@ 2022-03-09 22:09   ` Ludovic Courtès
  0 siblings, 0 replies; 9+ messages in thread
From: Ludovic Courtès @ 2022-03-09 22:09 UTC (permalink / raw)
  To: Nikolay Korotkiy; +Cc: 52548-done, Nikolay Korotkiy

Hi Nikolay,

Nikolay Korotkiy <sikmir@disroot.org> skribis:

> From: Nikolay Korotkiy <sikmir@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’.




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#52548] [PATCH] gnu: libosmium: Update to 2.18.0.
  2021-12-16 11:53 [bug#52548] [PATCH] gnu: Add osmium-tool Nikolay Korotkiy
                   ` (3 preceding siblings ...)
  2022-02-08  9:00 ` [bug#52548] [PATCH 1/2] " Nikolay Korotkiy via Guix-patches via
@ 2022-02-08  9:02 ` Nikolay Korotkiy via Guix-patches via
  4 siblings, 0 replies; 9+ messages in thread
From: Nikolay Korotkiy via Guix-patches via @ 2022-02-08  9:02 UTC (permalink / raw)
  To: 52548; +Cc: Nikolay Korotkiy

* 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





^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2022-03-09 22:10 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-16 11:53 [bug#52548] [PATCH] gnu: Add osmium-tool Nikolay Korotkiy
2021-12-16 11:56 ` [bug#52548] [PATCH] gnu: libosmium: Update to 2.17.2 Nikolay Korotkiy
2021-12-16 22:49 ` [bug#52548] [PATCH] gnu: Add osmium-tool Julien Lepiller
2021-12-16 23:03   ` Nikolay Korotkiy
2022-01-05 22:36     ` Ludovic Courtès
2022-02-08  8:56 ` Nikolay Korotkiy via Guix-patches via
2022-02-08  9:00 ` [bug#52548] [PATCH 1/2] " Nikolay Korotkiy via Guix-patches via
2022-03-09 22:09   ` bug#52548: [PATCH] " Ludovic Courtès
2022-02-08  9:02 ` [bug#52548] [PATCH] gnu: libosmium: Update to 2.18.0 Nikolay Korotkiy via Guix-patches via

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).