pyrox.dev
Merge pull request #250044 from sikmir/osm2pgsql
osm2pgsql: 1.8.1 → 1.9.0
authored by
Nikolay Korotkiy
and committed by
GitHub
d680ded2
b107015d
+21
-13
pkgs/tools/misc/osm2pgsql/default.nix
+21
-13
pkgs/tools/misc/osm2pgsql/default.nix
···
2
2
, fetchFromGitHub
3
3
, cmake
4
4
, expat
5
-
, fetchpatch
6
5
, fmt
7
6
, proj
8
7
, bzip2
9
8
, zlib
10
9
, boost
10
+
, cimg
11
11
, postgresql
12
12
, withLuaJIT ? false
13
13
, lua
14
14
, luajit
15
15
, libosmium
16
+
, nlohmann_json
17
+
, potrace
16
18
, protozero
17
19
, testers
18
20
}:
19
21
20
22
stdenv.mkDerivation (finalAttrs: {
21
23
pname = "osm2pgsql";
22
-
version = "1.8.1";
24
+
version = "1.9.0";
23
25
24
26
src = fetchFromGitHub {
25
27
owner = "openstreetmap";
26
28
repo = "osm2pgsql";
27
29
rev = finalAttrs.version;
28
-
hash = "sha256-8Jefd8dfoh/an7wd+8iTM0uOKA4UiUo8t2WzZs4r/Ck=";
30
+
hash = "sha256-ZIjT4uKJas5RgxcMSoR8hWCM9pdu3hSzWwfIn1ZvU8Y=";
29
31
};
30
32
31
-
patches = [
32
-
# Fix compatiblity with fmt 10.0. Remove with the next release
33
-
(fetchpatch {
34
-
url = "https://github.com/openstreetmap/osm2pgsql/commit/37aae6c874b58cd5cd27e70b2b433d6624fd7498.patch";
35
-
hash = "sha256-Fv2zPqhRDoJXlqB1Q9q5iskn28iqq3TYPcdqfu/pvD4=";
36
-
})
37
-
];
38
-
39
33
postPatch = ''
40
34
# Remove bundled libraries
41
35
rm -r contrib
···
43
37
44
38
nativeBuildInputs = [ cmake ];
45
39
46
-
buildInputs = [ expat fmt proj bzip2 zlib boost postgresql libosmium protozero ]
47
-
++ lib.optional withLuaJIT luajit
40
+
buildInputs = [
41
+
boost
42
+
bzip2
43
+
cimg
44
+
expat
45
+
fmt
46
+
libosmium
47
+
nlohmann_json
48
+
postgresql
49
+
potrace
50
+
proj
51
+
protozero
52
+
zlib
53
+
] ++ lib.optional withLuaJIT luajit
48
54
++ lib.optional (!withLuaJIT) lua;
49
55
50
56
cmakeFlags = [
···
52
58
"-DEXTERNAL_PROTOZERO=ON"
53
59
"-DEXTERNAL_FMT=ON"
54
60
] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON";
61
+
62
+
installFlags = [ "install-gen" ];
55
63
56
64
passthru.tests.version = testers.testVersion {
57
65
package = finalAttrs.finalPackage;