# HG changeset patch # User wenzelm # Date 1736029205 -3600 # Node ID ed5a05b06ee0568df44826007088f431126b88d4 # Parent b5d329f7fe95827791ca60b0f1f14051730d1ff0 updated Ubuntu versions; diff -r b5d329f7fe95 -r ed5a05b06ee0 NEWS --- a/NEWS Sat Jan 04 23:14:10 2025 +0100 +++ b/NEWS Sat Jan 04 23:20:05 2025 +0100 @@ -657,7 +657,7 @@ * Update to .NET / Fsharp 8.0.x: the current long-term support version. * Update to current Phorge 2024 week 35 (formerly Phabricator), with -support for Ubuntu 20.4 and 22.04. The Isabelle "system" manual now +support for Ubuntu 22.04 and 24.04. The Isabelle "system" manual now refers to the project as "Phorge", but "phabricator" remains for formal names (files, DNS etc.). diff -r b5d329f7fe95 -r ed5a05b06ee0 src/Doc/System/Phabricator.thy --- a/src/Doc/System/Phabricator.thy Sat Jan 04 23:14:10 2025 +0100 +++ b/src/Doc/System/Phabricator.thy Sat Jan 04 23:20:05 2025 +0100 @@ -58,7 +58,7 @@ section \Quick start\ text \ - The starting point is a fresh installation of \<^bold>\Ubuntu 20.04 or 22.04 + The starting point is a fresh installation of \<^bold>\Ubuntu 22.04 or 24.04 LTS\\<^footnote>\\<^url>\https://ubuntu.com/download\\: these versions are mandatory due to subtle dependencies on system packages and configuration that is assumed by the Isabelle setup tool. @@ -383,7 +383,7 @@ text \ The @{tool_def phabricator_setup} tool installs a fresh Phorge instance - on Ubuntu 20.04 or 22.04 LTS: + on Ubuntu 22.04 or 24.04 LTS: @{verbatim [display] \Usage: isabelle phabricator_setup [OPTIONS] Options are: @@ -419,7 +419,7 @@ further packages required by Phorge. This might require a reboot. Option \<^verbatim>\-M:\ installs a standard Mercurial release from source: a specific - version that is known to work on Ubuntu 20.04 or 22.04, respectively. It is + version that is known to work on Ubuntu 22.04 or 24.04, respectively. It is also possible to specify the path or URL of the source archive (\<^verbatim>\.tar.gz\). This option is recommended for production use, but it requires to \<^emph>\uninstall\ existing Mercurial packages provided by the operating system. diff -r b5d329f7fe95 -r ed5a05b06ee0 src/Pure/Tools/phabricator.scala --- a/src/Pure/Tools/phabricator.scala Sat Jan 04 23:14:10 2025 +0100 +++ b/src/Pure/Tools/phabricator.scala Sat Jan 04 23:20:05 2025 +0100 @@ -20,17 +20,6 @@ /* 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( @@ -56,8 +45,7 @@ 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 + if (release.is_ubuntu_22_04) packages_ubuntu_22_04 else if (release.is_ubuntu_24_04) packages_ubuntu_24_04 else error("Bad Linux version: expected Ubuntu 20.04 or 22.04 or 24.04 LTS") pkgs ::: webserver.packages() @@ -216,8 +204,7 @@ def standard_mercurial_source: String = { val release = Linux.Release() - if (release.is_ubuntu_20_04) "https://www.mercurial-scm.org/release/mercurial-3.9.2.tar.gz" - else if (release.is_ubuntu_22_04) "https://www.mercurial-scm.org/release/mercurial-6.1.4.tar.gz" + if (release.is_ubuntu_22_04) "https://www.mercurial-scm.org/release/mercurial-6.1.4.tar.gz" else "https://www.mercurial-scm.org/release/mercurial-6.8.2.tar.gz" }