Merge remote-tracking branch 'upstream/master'

[nominatim.git] / vagrant / Install-on-Ubuntu-18.sh

diff --git a/vagrant/Install-on-Ubuntu-18.sh b/vagrant/Install-on-Ubuntu-18.sh
index b853cdb53204a508beb33335e033dff2c9edc75e..e36086e19159128eb59c418c4b9559e6a9182c92 100755 (executable)
--- a/vagrant/Install-on-Ubuntu-18.sh
+++ b/vagrant/Install-on-Ubuntu-18.sh
@@ -24,16 +24,16 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
     sudo apt install -y php-cgi
     sudo apt install -y build-essential cmake g++ libboost-dev libboost-system-dev \
                         libboost-filesystem-dev libexpat1-dev zlib1g-dev\
     sudo apt install -y php-cgi
     sudo apt install -y build-essential cmake g++ libboost-dev libboost-system-dev \
                         libboost-filesystem-dev libexpat1-dev zlib1g-dev\

-                        libbz2-dev libpq-dev libproj-dev \
+                        libbz2-dev libpq-dev \

                         postgresql-10-postgis-2.4 \
                         postgresql-contrib-10 postgresql-10-postgis-scripts \
                         postgresql-10-postgis-2.4 \
                         postgresql-contrib-10 postgresql-10-postgis-scripts \

-                        php php-pgsql php-intl libicu-dev python3-pip \
+                        php-cli php-pgsql php-intl libicu-dev python3-pip \

                         python3-psutil python3-jinja2 python3-yaml python3-icu git
 
 # Some of the Python packages that come with Ubuntu 18.04 are too old, so
 # install the latest version from pip:
 
                         python3-psutil python3-jinja2 python3-yaml python3-icu git
 
 # Some of the Python packages that come with Ubuntu 18.04 are too old, so
 # install the latest version from pip:
 

-    pip3 install --user python-dotenv datrie pyyaml psycopg2-binary typing-extensions
+    pip3 install --user python-dotenv datrie pyyaml psycopg2-binary

 
 #
 # System Configuration
 
 #
 # System Configuration