diff options
| author | Nikolay Korotkiy <sikmir@disroot.org> | 2024-02-25 02:04:08 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-25 02:04:08 +0400 |
| commit | cf9209e72eb7331860c778ff9d82c66cb6d57be8 (patch) | |
| tree | 8dfc77a2fd656b156e0ba99759b9dceab92d227e /pkgs | |
| parent | 01e1fbc62559446eccb5b227683594f4d9abd136 (diff) | |
| parent | a88d8e9ecbfea86cd6d7b709cec2dc1c95aace07 (diff) | |
Merge pull request #289548 from sikmir/osm2pgsql
osm2pgsql: 1.10.0 → 1.11.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/by-name/os/osm2pgsql/package.nix (renamed from pkgs/tools/misc/osm2pgsql/default.nix) | 15 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/by-name/os/osm2pgsql/package.nix index 59ea5afb0e933..0ddfb737fcee1 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/by-name/os/osm2pgsql/package.nix @@ -5,6 +5,7 @@ , fmt , proj , bzip2 +, cli11 , zlib , boost , postgresql @@ -22,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "osm2pgsql"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "osm2pgsql-dev"; repo = "osm2pgsql"; rev = finalAttrs.version; - hash = "sha256-IFAQ7iA37QXnWOSxUjh9EW7ss85k0h948JGuuUcpr5w="; + hash = "sha256-95B4WVaf3AwaC+S6dCJpUq/1J47rOZjWUBxmRqHCu4w="; }; postPatch = '' @@ -41,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost bzip2 + cli11 expat fmt libosmium @@ -56,10 +58,11 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (!withLuaJIT) lua; cmakeFlags = [ - "-DEXTERNAL_LIBOSMIUM=ON" - "-DEXTERNAL_PROTOZERO=ON" - "-DEXTERNAL_FMT=ON" - ] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; + (lib.cmakeBool "EXTERNAL_LIBOSMIUM" true) + (lib.cmakeBool "EXTERNAL_PROTOZERO" true) + (lib.cmakeBool "EXTERNAL_FMT" true) + (lib.cmakeBool "WITH_LUAJIT" withLuaJIT) + ]; installFlags = [ "install-gen" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1045661620c3d..afd7b9b2eb4b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33838,8 +33838,6 @@ with pkgs; opsdroid = callPackage ../applications/networking/opsdroid { }; - osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; - ostinato = libsForQt5.callPackage ../applications/networking/ostinato { protobuf = protobuf_21; }; |