pyrox.dev / nixpkgs
lol
fork atom

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 -8
unified split
+9 -6
pkgs/tools/misc/osm2pgsql/default.nix pkgs/by-name/os/osm2pgsql/package.nix
··· 5 5 , fmt 6 6 , proj 7 7 , bzip2 8 + , cli11 8 9 , zlib 9 10 , boost 10 11 , postgresql ··· 22 23 23 24 stdenv.mkDerivation (finalAttrs: { 24 25 pname = "osm2pgsql"; 25 - version = "1.10.0"; 26 + version = "1.11.0"; 26 27 27 28 src = fetchFromGitHub { 28 29 owner = "osm2pgsql-dev"; 29 30 repo = "osm2pgsql"; 30 31 rev = finalAttrs.version; 31 - hash = "sha256-IFAQ7iA37QXnWOSxUjh9EW7ss85k0h948JGuuUcpr5w="; 32 + hash = "sha256-95B4WVaf3AwaC+S6dCJpUq/1J47rOZjWUBxmRqHCu4w="; 32 33 }; 33 34 34 35 postPatch = '' ··· 41 42 buildInputs = [ 42 43 boost 43 44 bzip2 45 + cli11 44 46 expat 45 47 fmt 46 48 libosmium ··· 56 58 ++ lib.optional (!withLuaJIT) lua; 57 59 58 60 cmakeFlags = [ 59 - "-DEXTERNAL_LIBOSMIUM=ON" 60 - "-DEXTERNAL_PROTOZERO=ON" 61 - "-DEXTERNAL_FMT=ON" 62 - ] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; 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 + ]; 63 66 64 67 installFlags = [ "install-gen" ]; 65 68
-2
pkgs/top-level/all-packages.nix
··· 33838 33838 33839 33839 opsdroid = callPackage ../applications/networking/opsdroid { }; 33840 33840 33841 - osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; 33842 - 33843 33841 ostinato = libsForQt5.callPackage ../applications/networking/ostinato { 33844 33842 protobuf = protobuf_21; 33845 33843 };