Unverified Commit 977a49df authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

Merge pull request #311864 from mausch/nominatim2 

nominatim: 4.0.1 -> 4.4.0
parents 4eba8383 f48b3baf

pkgs/servers/nominatim/default.nix

+8 −4
Original line number Diff line number Diff line 
{ 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

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 { };