pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #311864 from mausch/nominatim2

nominatim: 4.0.1 -> 4.4.0

authored by Aleksana and committed by GitHub 977a49df 4eba8383

+9 -5
unified split
+8 -4
pkgs/servers/nominatim/default.nix
··· 1 { stdenv, lib, fetchFromGitHub, fetchurl 2 - , clang-tools, cmake, bzip2, zlib, expat, boost, git, pandoc 3 # Nominatim needs to be built with the same postgres version it will target 4 , postgresql 5 - , python3, php 6 }: 7 8 let ··· 14 in 15 stdenv.mkDerivation rec { 16 pname = "nominatim"; 17 - version = "4.0.1"; 18 19 src = fetchFromGitHub { 20 owner = "osm-search"; 21 repo = "Nominatim"; 22 rev = "v${version}"; 23 fetchSubmodules = true; 24 - sha256 = "sha256-sKI/KBKveb5kAWJ7y1xw+ZF1thynr402rJhVjkIdFMo="; 25 }; 26 27 nativeBuildInputs = [ ··· 30 git 31 pandoc 32 php 33 ]; 34 35 buildInputs = [ ··· 37 zlib 38 expat 39 boost 40 (python3.withPackages (ps: with ps; [ 41 pyyaml 42 python-dotenv 43 psycopg2 44 psutil 45 jinja2 46 pyicu
··· 1 { stdenv, lib, fetchFromGitHub, fetchurl 2 + , clang-tools, cmake, bzip2, zlib, expat, boost, git, pandoc, nlohmann_json 3 # Nominatim needs to be built with the same postgres version it will target 4 , postgresql 5 + , python3, php, lua 6 }: 7 8 let ··· 14 in 15 stdenv.mkDerivation rec { 16 pname = "nominatim"; 17 + version = "4.4.0"; 18 19 src = fetchFromGitHub { 20 owner = "osm-search"; 21 repo = "Nominatim"; 22 rev = "v${version}"; 23 fetchSubmodules = true; 24 + sha256 = "sha256-GPMDbvTPl9SLpZi5gyRAPQ84NSTIRoSfGJeqWs1e9Oo="; 25 }; 26 27 nativeBuildInputs = [ ··· 30 git 31 pandoc 32 php 33 + lua 34 ]; 35 36 buildInputs = [ ··· 38 zlib 39 expat 40 boost 41 + nlohmann_json 42 (python3.withPackages (ps: with ps; [ 43 pyyaml 44 python-dotenv 45 psycopg2 46 + sqlalchemy 47 + asyncpg 48 psutil 49 jinja2 50 pyicu
+1 -1
pkgs/top-level/all-packages.nix
··· 1970 node-glob = callPackage ../tools/misc/node-glob { }; 1971 1972 nominatim = callPackage ../servers/nominatim { 1973 - postgresql = postgresql_12; 1974 }; 1975 1976 npm-check-updates = callPackage ../tools/package-management/npm-check-updates { };
··· 1970 node-glob = callPackage ../tools/misc/node-glob { }; 1971 1972 nominatim = callPackage ../servers/nominatim { 1973 + postgresql = postgresql_14; 1974 }; 1975 1976 npm-check-updates = callPackage ../tools/package-management/npm-check-updates { };