diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
| commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
| tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/tools/misc/osm2pgsql | |
| parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
| parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
| download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/osm2pgsql')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix b/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix index 1fa26d1f6d0c..5f4ff20e5d9b 100644 --- a/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix +++ b/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix @@ -2,40 +2,34 @@ , fetchFromGitHub , cmake , expat -, fetchpatch , fmt , proj , bzip2 , zlib , boost +, cimg , postgresql , withLuaJIT ? false , lua , luajit , libosmium +, nlohmann_json +, potrace , protozero , testers }: stdenv.mkDerivation (finalAttrs: { pname = "osm2pgsql"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "osm2pgsql"; rev = finalAttrs.version; - hash = "sha256-8Jefd8dfoh/an7wd+8iTM0uOKA4UiUo8t2WzZs4r/Ck="; + hash = "sha256-ZIjT4uKJas5RgxcMSoR8hWCM9pdu3hSzWwfIn1ZvU8Y="; }; - patches = [ - # Fix compatiblity with fmt 10.0. Remove with the next release - (fetchpatch { - url = "https://github.com/openstreetmap/osm2pgsql/commit/37aae6c874b58cd5cd27e70b2b433d6624fd7498.patch"; - hash = "sha256-Fv2zPqhRDoJXlqB1Q9q5iskn28iqq3TYPcdqfu/pvD4="; - }) - ]; - postPatch = '' # Remove bundled libraries rm -r contrib @@ -43,8 +37,20 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ expat fmt proj bzip2 zlib boost postgresql libosmium protozero ] - ++ lib.optional withLuaJIT luajit + buildInputs = [ + boost + bzip2 + cimg + expat + fmt + libosmium + nlohmann_json + postgresql + potrace + proj + protozero + zlib + ] ++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua; cmakeFlags = [ @@ -53,6 +59,8 @@ stdenv.mkDerivation (finalAttrs: { "-DEXTERNAL_FMT=ON" ] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; + installFlags = [ "install-gen" ]; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; |