From patchwork Tue Feb 8 09:00:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Korotkiy X-Patchwork-Id: 37088 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 323F427BBEA; Tue, 8 Feb 2022 16:12:53 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EE1E727BBE9 for ; Tue, 8 Feb 2022 16:12:52 +0000 (GMT) Received: from localhost ([::1]:50024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHT6q-0004bU-0u for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 11:12:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35228) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHQdA-0005SZ-Lk for guix-patches@gnu.org; Tue, 08 Feb 2022 08:34:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51969) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHQd9-0004aY-N7 for guix-patches@gnu.org; Tue, 08 Feb 2022 08:34:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHQd9-0003TW-Lb for guix-patches@gnu.org; Tue, 08 Feb 2022 08:34:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52548] [PATCH 1/2] gnu: Add osmium-tool. References: In-Reply-To: Resent-From: Nikolay Korotkiy Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 13:34:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52548 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52548@debbugs.gnu.org Cc: Nikolay Korotkiy Received: via spool by 52548-submit@debbugs.gnu.org id=B52548.164432722313282 (code B ref 52548); Tue, 08 Feb 2022 13:34:03 +0000 Received: (at 52548) by debbugs.gnu.org; 8 Feb 2022 13:33:43 +0000 Received: from localhost ([127.0.0.1]:45857 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHQcp-0003S4-4P for submit@debbugs.gnu.org; Tue, 08 Feb 2022 08:33:43 -0500 Received: from knopi.disroot.org ([178.21.23.139]:36628) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHMNH-0001Q4-Rh for 52548@debbugs.gnu.org; Tue, 08 Feb 2022 04:01:24 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 2464E8C197; Tue, 8 Feb 2022 10:01:23 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UXewryPktmC8; Tue, 8 Feb 2022 10:01:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1644310858; bh=8apKQc3+UmmQZyef5seREPgcZEXcMkrcGMKd6vv0JhE=; h=From:To:Cc:Subject:Date; b=kEjCiEYmUydTTGRY76e467aqaNN+yr7k2B3ThKhLHZ9UTCDX/SskOpYSb1wEnlCxc QGbGZ/bEDBB+5WyxWBQslt7+S2azssteBgB9rqPkLm1joSh0kGFqj8eqUSd8r0Al8/ jXic04Hqapq0royMwEGI5jlV+vfMtXPUWKXqBSs6m0YvMKSqwfxA5RxU86sZoHW9wO wV58g9yPeCBNXFzw8RSI8aGm3cK0FdDSzjcF1EykUXjjcoa6xODlue/jxvgxhw+abt A9LNylxiZp/3ISZuNFT8/VB3wUc7bA63cwnUD7sshEaKwq+fIb9e8cWwIlM7pTDuxq fBXIN5xw4SAqA== Date: Tue, 8 Feb 2022 12:00:48 +0300 Message-Id: Mime-Version: 1.0 X-Mailman-Approved-At: Tue, 08 Feb 2022 08:33:40 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Tue, 08 Feb 2022 09:04:30 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Nikolay Korotkiy X-ACL-Warn: , Nikolay Korotkiy via Guix-patches X-Patchwork-Original-From: Nikolay Korotkiy via Guix-patches via From: Nikolay Korotkiy X-getmail-retrieved-from-mailbox: Patches From: Nikolay Korotkiy * 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")