diff options
| author | Nikolay Korotkiy <sikmir@disroot.org> | 2023-01-28 23:14:45 +0300 |
|---|---|---|
| committer | Nikolay Korotkiy <sikmir@disroot.org> | 2023-01-28 23:14:45 +0300 |
| commit | 1b11f07b5877e41ee17302b6356c49b13a4bc157 (patch) | |
| tree | b95bf881e7ba6df7acaef89248fb8b8bd97fce6b /pkgs/tools/misc/osm2pgsql/default.nix | |
| parent | 1066f160ebc24eaddd43ceb5cd386913d63d610e (diff) | |
| download | nixpkgs-1b11f07b5877e41ee17302b6356c49b13a4bc157.tar nixpkgs-1b11f07b5877e41ee17302b6356c49b13a4bc157.tar.gz nixpkgs-1b11f07b5877e41ee17302b6356c49b13a4bc157.tar.bz2 nixpkgs-1b11f07b5877e41ee17302b6356c49b13a4bc157.tar.lz nixpkgs-1b11f07b5877e41ee17302b6356c49b13a4bc157.tar.xz nixpkgs-1b11f07b5877e41ee17302b6356c49b13a4bc157.tar.zst nixpkgs-1b11f07b5877e41ee17302b6356c49b13a4bc157.zip | |
osm2pgsql: 1.7.2 → 1.8.0
Diffstat (limited to 'pkgs/tools/misc/osm2pgsql/default.nix')
| -rw-r--r-- | pkgs/tools/misc/osm2pgsql/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index ece08183032..1e310fb4c1e 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "osm2pgsql"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "osm2pgsql"; rev = finalAttrs.version; - hash = "sha256-KJkqzvsm0IMaqeKnIbLGeOSJrsLvW+z7lCg6NbuU13g="; + hash = "sha256-v+/pT8HnLoeeYe33v4xUoR5YWD/jHgEG/Q11Trw9X2s="; }; postPatch = '' @@ -35,14 +35,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ expat fmt proj bzip2 zlib boost postgresql libosmium protozero rapidjson ] + buildInputs = [ expat fmt proj bzip2 zlib boost postgresql libosmium protozero ] ++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua; cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_PROTOZERO=ON" - "-DEXTERNAL_RAPIDJSON=ON" "-DEXTERNAL_FMT=ON" ] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; |