pyrox.dev
Merge pull request #289548 from sikmir/osm2pgsql
osm2pgsql: 1.10.0 → 1.11.0
authored by
Nikolay Korotkiy
and committed by
GitHub
cf9209e7
01e1fbc6
+9
-6
pkgs/tools/misc/osm2pgsql/default.nix
pkgs/by-name/os/osm2pgsql/package.nix
+9
-6
pkgs/tools/misc/osm2pgsql/default.nix
pkgs/by-name/os/osm2pgsql/package.nix
···
5
, fmt
6
, proj
7
, bzip2
8
, zlib
9
, boost
10
, postgresql
···
22
23
stdenv.mkDerivation (finalAttrs: {
24
pname = "osm2pgsql";
25
-
version = "1.10.0";
26
27
src = fetchFromGitHub {
28
owner = "osm2pgsql-dev";
29
repo = "osm2pgsql";
30
rev = finalAttrs.version;
31
-
hash = "sha256-IFAQ7iA37QXnWOSxUjh9EW7ss85k0h948JGuuUcpr5w=";
32
};
33
34
postPatch = ''
···
41
buildInputs = [
42
boost
43
bzip2
44
expat
45
fmt
46
libosmium
···
56
++ lib.optional (!withLuaJIT) lua;
57
58
cmakeFlags = [
59
-
"-DEXTERNAL_LIBOSMIUM=ON"
60
-
"-DEXTERNAL_PROTOZERO=ON"
61
-
"-DEXTERNAL_FMT=ON"
62
-
] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON";
63
64
installFlags = [ "install-gen" ];
65
···
5
, fmt
6
, proj
7
, bzip2
8
+
, cli11
9
, zlib
10
, boost
11
, postgresql
···
23
24
stdenv.mkDerivation (finalAttrs: {
25
pname = "osm2pgsql";
26
+
version = "1.11.0";
27
28
src = fetchFromGitHub {
29
owner = "osm2pgsql-dev";
30
repo = "osm2pgsql";
31
rev = finalAttrs.version;
32
+
hash = "sha256-95B4WVaf3AwaC+S6dCJpUq/1J47rOZjWUBxmRqHCu4w=";
33
};
34
35
postPatch = ''
···
42
buildInputs = [
43
boost
44
bzip2
45
+
cli11
46
expat
47
fmt
48
libosmium
···
58
++ lib.optional (!withLuaJIT) lua;
59
60
cmakeFlags = [
61
+
(lib.cmakeBool "EXTERNAL_LIBOSMIUM" true)
62
+
(lib.cmakeBool "EXTERNAL_PROTOZERO" true)
63
+
(lib.cmakeBool "EXTERNAL_FMT" true)
64
+
(lib.cmakeBool "WITH_LUAJIT" withLuaJIT)
65
+
];
66
67
installFlags = [ "install-gen" ];
68
-2
pkgs/top-level/all-packages.nix
-2
pkgs/top-level/all-packages.nix