diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-16 12:01:25 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-16 12:01:25 +0000 |
commit | 350d12c2fbd418ce1ba9f8737662e617629d8f60 (patch) | |
tree | e1521d15fa987a5d8f8a9cb9deddb83fef18915b /pkgs/servers/nominatim | |
parent | 1887e39d7e68bb191eb804c0f976ad25b3980595 (diff) | |
parent | c68fb0f3730abab90db6bd70e9fda5493315876a (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/nominatim')
-rw-r--r-- | pkgs/servers/nominatim/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/servers/nominatim/default.nix b/pkgs/servers/nominatim/default.nix index db126863fe04b..4b39480a4a9b3 100644 --- a/pkgs/servers/nominatim/default.nix +++ b/pkgs/servers/nominatim/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchFromGitHub, fetchurl -, clang-tools, cmake, bzip2, zlib, expat, boost, git, pandoc +, clang-tools, cmake, bzip2, zlib, expat, boost, git, pandoc, nlohmann_json # Nominatim needs to be built with the same postgres version it will target , postgresql -, python3, php +, python3, php, lua }: let @@ -14,14 +14,14 @@ let in stdenv.mkDerivation rec { pname = "nominatim"; - version = "4.0.1"; + version = "4.4.0"; src = fetchFromGitHub { owner = "osm-search"; repo = "Nominatim"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-sKI/KBKveb5kAWJ7y1xw+ZF1thynr402rJhVjkIdFMo="; + sha256 = "sha256-GPMDbvTPl9SLpZi5gyRAPQ84NSTIRoSfGJeqWs1e9Oo="; }; nativeBuildInputs = [ @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { git pandoc php + lua ]; buildInputs = [ @@ -37,10 +38,13 @@ stdenv.mkDerivation rec { zlib expat boost + nlohmann_json (python3.withPackages (ps: with ps; [ pyyaml python-dotenv psycopg2 + sqlalchemy + asyncpg psutil jinja2 pyicu |