nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-03 12:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #311864 from mausch/nominatim2

Browse Source 
nominatim: 4.0.1 -> 4.4.0
This commit is contained in:
Aleksana 2024-05-16 17:18:16 +08:00 committed by GitHub
commit 977a49df31
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/servers/nominatim/default.nix
View File

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

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

@ -1970,7 +1970,7 @@ with pkgs;
node-glob = callPackage ../tools/misc/node-glob { };
nominatim = callPackage ../servers/nominatim {
postgresql = postgresql_12;
postgresql = postgresql_14;
};
npm-check-updates = callPackage ../tools/package-management/npm-check-updates { };