diff options
| author | Nikolay Korotkiy <sikmir@disroot.org> | 2023-09-24 23:54:05 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-24 23:54:05 +0400 |
| commit | 89a6d10b3e18edfd7d4b64f5237e69a8a4e7f759 (patch) | |
| tree | c4907714365d8ffbe98be979db03ba3f3bef956e | |
| parent | bbfbf65de03a297862316bb96ab8212cc79f3345 (diff) | |
| parent | 93e9acacc7d457cdd471af0afec5693ef7e1e7d2 (diff) | |
Merge pull request #256339 from sikmir/osmium
libosmium: 2.19.0 → 2.20.0, osmium-tool: 1.15.0 → 1.16.0
| -rw-r--r-- | pkgs/applications/misc/osmium-tool/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/libosmium/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pyosmium/default.nix | 10 |
3 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix index 00d157eb25fb0..cf7c419e40de3 100644 --- a/pkgs/applications/misc/osmium-tool/default.nix +++ b/pkgs/applications/misc/osmium-tool/default.nix @@ -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 = [ diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix index d86755837b4a3..63aab4c0bfb10 100644 --- a/pkgs/development/libraries/libosmium/default.nix +++ b/pkgs/development/libraries/libosmium/default.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index 289f4d1c048e9..40090532fea1b 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -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 ]; |