nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-23 12:34:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #256339 from sikmir/osmium

Browse Source 
libosmium: 2.19.0 → 2.20.0, osmium-tool: 1.15.0 → 1.16.0
This commit is contained in:
Nikolay Korotkiy 2023-09-24 23:54:05 +04:00 committed by GitHub
commit 89a6d10b3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/osmium-tool/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "osmium-tool";
version = "1.15.0";
version = "1.16.0";
src = fetchFromGitHub {
owner = "osmcode";
repo = "osmium-tool";
rev = "v${version}";
sha256 = "sha256-xV/1LFby0L/o648XEQQ9gS9/eHssWhMIG7R1E8bfIDU=";
sha256 = "sha256-DObqbzdPA4RlrlcZhqA0MQtWBE+D6GRD1pd9U4DARIk=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/libosmium/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libosmium";
version = "2.19.0";
version = "2.20.0";
src = fetchFromGitHub {
owner = "osmcode";
repo = "libosmium";
rev = "v${version}";
sha256 = "sha256-R7kOhQFfGYuHNkIZV4BTE+WKjHnCJwKeIWjCJNrvyTQ=";
sha256 = "sha256-QM6Nj2cmrhUysR2enFKhTWXdBXNqM21/Yqdn/zXEfYE=";
};
nativeBuildInputs = [ cmake ];

10
pkgs/development/python-modules/pyosmium/default.nix
View File

@ -1,8 +1,8 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, cmake
, python
, libosmium
, protozero
, boost
@ -32,6 +32,14 @@ buildPythonPackage rec {
hash = "sha256-+YJQGPQm2FGOPhNzlXX2GM+ad4QdipJhwViOKGHtqBk=";
};
patches = [
# Compatibility with recent pybind versions
(fetchpatch {
url = "https://github.com/osmcode/pyosmium/commit/31b1363389b423f49e14140ce868ecac83e92f69.patch";
hash = "sha256-maBuwzyZ4/wVLLGVr4gZFZDKvJckUXiBluxZRPGETag=";
})
];
nativeBuildInputs = [
cmake
];