colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #289548 from sikmir/osm2pgsql

Browse Source 
osm2pgsql: 1.10.0 → 1.11.0
This commit is contained in:
Nikolay Korotkiy 2024-02-25 02:04:08 +04:00 committed by GitHub
commit cf9209e72e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/tools/misc/osm2pgsql/default.nix → pkgs/by-name/os/osm2pgsql/package.nix
View File

@ -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" ];

2
pkgs/top-level/all-packages.nix
View File

@ -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;
};