Unverified Commit 89a6d10b authored by Nikolay Korotkiy's avatar Nikolay Korotkiy Committed by GitHub
Browse files

Merge pull request #256339 from sikmir/osmium 

libosmium: 2.19.0 → 2.20.0, osmium-tool: 1.15.0 → 1.16.0
parents bbfbf65d 93e9acac

pkgs/applications/misc/osmium-tool/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = [

pkgs/development/libraries/libosmium/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 ];

pkgs/development/python-modules/pyosmium/default.nix

+9 −1
Original line number Diff line number Diff line 
{ 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

  ];