# HG changeset patch
# User wenzelm
# Date 1706035189 -3600
# Node ID 627bb49a11118fcd1469a89499c6f21d93b85e35
# Parent  557f00504bb60c1f6320fdbc54b4877f25a15d9d
tuned source structure;

diff -r 557f00504bb6 -r 627bb49a1111 src/Pure/Tools/phabricator.scala
--- a/src/Pure/Tools/phabricator.scala	Tue Jan 23 16:30:29 2024 +0100
+++ b/src/Pure/Tools/phabricator.scala	Tue Jan 23 19:39:49 2024 +0100
@@ -18,6 +18,38 @@
 object Phabricator {
   /** defaults **/
 
+  /* system packages */
+
+  val packages_ubuntu_20_04: List[String] =
+    Docker_Build.packages :::
+    List(
+      // https://secure.phabricator.com/source/phabricator/browse/master/scripts/install/install_ubuntu.sh 15e6e2adea61
+      "git", "mysql-server", "php", "php-mysql", "php-gd", "php-curl", "php-apcu", "php-cli",
+      "php-json", "php-mbstring",
+      // more packages
+      "php-xml", "php-zip", "python3-pygments", "ssh", "subversion", "python-pygments",
+      // mercurial build packages
+      "make", "gcc", "python", "python2-dev", "python-docutils", "python-openssl")
+
+  val packages_ubuntu_22_04: List[String] =
+    Docker_Build.packages :::
+    List(
+      // https://secure.phabricator.com/source/phabricator/browse/master/scripts/install/install_ubuntu.sh 15e6e2adea61
+      "git", "mysql-server", "php", "php-mysql", "php-gd", "php-curl", "php-apcu", "php-cli",
+      "php-json", "php-mbstring",
+      // more packages
+      "php-xml", "php-zip", "python3-pygments", "ssh", "subversion")
+
+  def packages(webserver: Webserver): List[String] = {
+    val release = Linux.Release()
+    val pkgs =
+      if (release.is_ubuntu_20_04) packages_ubuntu_20_04
+      else if (release.is_ubuntu_22_04) packages_ubuntu_22_04
+      else error("Bad Linux version: expected Ubuntu 20.04 or 22.04 LTS")
+    pkgs ::: webserver.packages()
+  }
+
+
   /* webservers */
 
   sealed abstract class Webserver {
@@ -140,39 +172,6 @@
   val default_webserver: Webserver = Apache
 
 
-
-  /* system packages */
-
-  val packages_ubuntu_20_04: List[String] =
-    Docker_Build.packages :::
-    List(
-      // https://secure.phabricator.com/source/phabricator/browse/master/scripts/install/install_ubuntu.sh 15e6e2adea61
-      "git", "mysql-server", "php", "php-mysql", "php-gd", "php-curl", "php-apcu", "php-cli",
-      "php-json", "php-mbstring",
-      // more packages
-      "php-xml", "php-zip", "python3-pygments", "ssh", "subversion", "python-pygments",
-      // mercurial build packages
-      "make", "gcc", "python", "python2-dev", "python-docutils", "python-openssl")
-
-  val packages_ubuntu_22_04: List[String] =
-    Docker_Build.packages :::
-    List(
-      // https://secure.phabricator.com/source/phabricator/browse/master/scripts/install/install_ubuntu.sh 15e6e2adea61
-      "git", "mysql-server", "php", "php-mysql", "php-gd", "php-curl", "php-apcu", "php-cli",
-      "php-json", "php-mbstring",
-      // more packages
-      "php-xml", "php-zip", "python3-pygments", "ssh", "subversion")
-
-  def packages(webserver: Webserver): List[String] = {
-    val release = Linux.Release()
-    val pkgs =
-      if (release.is_ubuntu_20_04) packages_ubuntu_20_04
-      else if (release.is_ubuntu_22_04) packages_ubuntu_22_04
-      else error("Bad Linux version: expected Ubuntu 20.04 or 22.04 LTS")
-    pkgs ::: webserver.packages()
-  }
-
-
   /* global system resources */
 
   val www_user = "www-data"