# HG changeset patch
# User paulson
# Date 1603139371 -3600
# Node ID a9aaef9fcf86d68d5594d55f156a22ca7ae3eba1
# Parent  b5f7fc7d23238ce2184c26cded8707624de0e5ce# Parent  7956d958ef5bb182c84a091475252fa3dd09d57c
merged

diff -r 7956d958ef5b -r a9aaef9fcf86 CONTRIBUTORS
--- a/CONTRIBUTORS	Mon Oct 19 21:29:21 2020 +0100
+++ b/CONTRIBUTORS	Mon Oct 19 21:29:31 2020 +0100
@@ -9,6 +9,9 @@
 * October 2020: Mathias Fleury
   Updated proof reconstruction for the SMT solver veriT in the smt method.
 
+* October 2020: Jasmin Blanchette, Martin Desharnais
+  Integration of E 2.5 for Sledgehammer.
+
 * August 2020: Makarius Wenzel
   Improved monitoring of runtime statistics: ML GC progress and Java.
 
diff -r 7956d958ef5b -r a9aaef9fcf86 src/Pure/System/linux.scala
--- a/src/Pure/System/linux.scala	Mon Oct 19 21:29:21 2020 +0100
+++ b/src/Pure/System/linux.scala	Mon Oct 19 21:29:31 2020 +0100
@@ -12,11 +12,6 @@
 
 object Linux
 {
-  /* required packages */
-
-  val packages: List[String] = List("pwgen")
-
-
   /* check system */
 
   def check_system(): Unit =
diff -r 7956d958ef5b -r a9aaef9fcf86 src/Pure/Tools/build_docker.scala
--- a/src/Pure/Tools/build_docker.scala	Mon Oct 19 21:29:21 2020 +0100
+++ b/src/Pure/Tools/build_docker.scala	Mon Oct 19 21:29:31 2020 +0100
@@ -15,7 +15,7 @@
   private val Isabelle_Name = """^.*?(Isabelle[^/\\:]+)_linux\.tar\.gz$""".r
 
   val packages: List[String] =
-    List("curl", "less", "libfontconfig1", "libgomp1", "libwww-perl", "rlwrap", "unzip")
+    List("curl", "less", "libfontconfig1", "libgomp1", "libwww-perl", "pwgen", "rlwrap", "unzip")
 
   val package_collections: Map[String, List[String]] =
     Map("X11" -> List("libx11-6", "libxext6", "libxrender1", "libxtst6", "libxi6"),
diff -r 7956d958ef5b -r a9aaef9fcf86 src/Pure/Tools/phabricator.scala
--- a/src/Pure/Tools/phabricator.scala	Mon Oct 19 21:29:21 2020 +0100
+++ b/src/Pure/Tools/phabricator.scala	Mon Oct 19 21:29:31 2020 +0100
@@ -22,7 +22,7 @@
   /* required packages */
 
   val packages: List[String] =
-    Build_Docker.packages ::: Linux.packages :::
+    Build_Docker.packages :::
     List(
       // https://secure.phabricator.com/source/phabricator/browse/master/scripts/install/install_ubuntu.sh 15e6e2adea61
       "git", "mysql-server", "apache2", "libapache2-mod-php", "php", "php-mysql",