diff --git a/pkgs/servers/nominatim/default.nix b/pkgs/servers/nominatim/default.nix index 3994177e0847..8c0410b87ac3 100644 --- a/pkgs/servers/nominatim/default.nix +++ b/pkgs/servers/nominatim/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchFromGitHub, fetchurl -, clang-tools, cmake, bzip2, zlib, expat, boost, git, pandoc, gzip -, postgresql_12 -, python3, python3Packages, php +, clang-tools, cmake, bzip2, zlib, expat, boost, git, pandoc +# Nominatim needs to be built with the same postgres version it will target +, postgresql +, python3, php }: let @@ -36,21 +37,19 @@ stdenv.mkDerivation rec { zlib expat boost - python3 + (python3.withPackages (ps: with ps; [ + pyyaml + python-dotenv + psycopg2 + psutil + jinja2 + pyicu + datrie + ])) # python3Packages.pylint # We don't want to run pylint because the package could break on pylint bumps which is really annoying. # python3Packages.pytest # disabled since I can't get it to run tests anyway # python3Packages.behave # disabled since I can't get it to run tests anyway - postgresql_12 - ]; - - propagatedBuildInputs = with python3Packages; [ - pyyaml - python-dotenv - psycopg2 - psutil - jinja2 - pyicu - datrie + postgresql ]; postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48791c427aa3..9ba5897359be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1964,7 +1964,9 @@ with pkgs; node-glob = callPackage ../tools/misc/node-glob { }; - nominatim = callPackage ../servers/nominatim { }; + nominatim = callPackage ../servers/nominatim { + postgresql = postgresql_12; + }; npm-check-updates = callPackage ../tools/package-management/npm-check-updates { };