tjh.dev
Merge pull request #256339 from sikmir/osmium
libosmium: 2.19.0 → 2.20.0, osmium-tool: 1.15.0 → 1.16.0
authored by Nikolay Korotkiy and committed by GitHub 89a6d10b bbfbf65d
+2
-2
pkgs/applications/misc/osmium-tool/default.nix
+2
-2
pkgs/applications/misc/osmium-tool/default.nix
···
14
14
15
15
stdenv.mkDerivation rec {
16
16
pname = "osmium-tool";
17
-
version = "1.15.0";
17
+
version = "1.16.0";
18
18
19
19
src = fetchFromGitHub {
20
20
owner = "osmcode";
21
21
repo = "osmium-tool";
22
22
rev = "v${version}";
23
-
sha256 = "sha256-xV/1LFby0L/o648XEQQ9gS9/eHssWhMIG7R1E8bfIDU=";
23
+
sha256 = "sha256-DObqbzdPA4RlrlcZhqA0MQtWBE+D6GRD1pd9U4DARIk=";
24
24
};
25
25
26
26
nativeBuildInputs = [
+2
-2
pkgs/development/libraries/libosmium/default.nix
+2
-2
pkgs/development/libraries/libosmium/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "libosmium";
5
-
version = "2.19.0";
5
+
version = "2.20.0";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "osmcode";
9
9
repo = "libosmium";
10
10
rev = "v${version}";
11
-
sha256 = "sha256-R7kOhQFfGYuHNkIZV4BTE+WKjHnCJwKeIWjCJNrvyTQ=";
11
+
sha256 = "sha256-QM6Nj2cmrhUysR2enFKhTWXdBXNqM21/Yqdn/zXEfYE=";
12
12
};
13
13
14
14
nativeBuildInputs = [ cmake ];
+9
-1
pkgs/development/python-modules/pyosmium/default.nix
+9
-1
pkgs/development/python-modules/pyosmium/default.nix
···
1
1
{ lib
2
2
, buildPythonPackage
3
3
, fetchFromGitHub
4
+
, fetchpatch
4
5
, cmake
5
-
, python
6
6
, libosmium
7
7
, protozero
8
8
, boost
···
31
31
rev = "refs/tags/v${version}";
32
32
hash = "sha256-+YJQGPQm2FGOPhNzlXX2GM+ad4QdipJhwViOKGHtqBk=";
33
33
};
34
+
35
+
patches = [
36
+
# Compatibility with recent pybind versions
37
+
(fetchpatch {
38
+
url = "https://github.com/osmcode/pyosmium/commit/31b1363389b423f49e14140ce868ecac83e92f69.patch";
39
+
hash = "sha256-maBuwzyZ4/wVLLGVr4gZFZDKvJckUXiBluxZRPGETag=";
40
+
})
41
+
];
34
42
35
43
nativeBuildInputs = [
36
44
cmake