about summary refs log tree commit diff
diff options
context:
space:
mode:
authorElis Hirwing <elis@hirwing.se>2022-05-25 19:06:58 +0200
committerElis Hirwing <elis@hirwing.se>2022-06-08 18:11:55 +0200
commite91811bbe107b7dad31075254344a3ec57cfa4de (patch)
tree5921fadd27c0a574a850f235af10fab796b0f830
parent9ec41c8875c00d230f2461f3dce1d16e24070015 (diff)
downloadnixlib-e91811bbe107b7dad31075254344a3ec57cfa4de.tar
nixlib-e91811bbe107b7dad31075254344a3ec57cfa4de.tar.gz
nixlib-e91811bbe107b7dad31075254344a3ec57cfa4de.tar.bz2
nixlib-e91811bbe107b7dad31075254344a3ec57cfa4de.tar.lz
nixlib-e91811bbe107b7dad31075254344a3ec57cfa4de.tar.xz
nixlib-e91811bbe107b7dad31075254344a3ec57cfa4de.tar.zst
nixlib-e91811bbe107b7dad31075254344a3ec57cfa4de.zip
php74: Drop PHP 7.4 and add aliases throwing an error
-rw-r--r--doc/languages-frameworks/php.section.md4
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2211.section.xml6
-rw-r--r--nixos/doc/manual/release-notes/rl-2211.section.md2
-rw-r--r--nixos/tests/all-tests.nix1
-rw-r--r--pkgs/development/interpreters/php/7.4.nix52
-rw-r--r--pkgs/top-level/aliases.nix4
-rw-r--r--pkgs/top-level/all-packages.nix7
7 files changed, 14 insertions, 62 deletions
diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md
index 5977363323f1..8600e49d4570 100644
--- a/doc/languages-frameworks/php.section.md
+++ b/doc/languages-frameworks/php.section.md
@@ -9,7 +9,7 @@ wide variety of extensions and libraries available.
 
 The different versions of PHP that nixpkgs provides are located under
 attributes named based on major and minor version number; e.g.,
-`php74` is PHP 7.4.
+`php81` is PHP 8.1.
 
 Only versions of PHP that are supported by upstream for the entirety
 of a given NixOS release will be included in that release of
@@ -23,7 +23,7 @@ NixOS - not necessarily the latest major release from upstream.
 All available PHP attributes are wrappers around their respective
 binary PHP package and provide commonly used extensions this way. The
 real PHP 7.4 package, i.e. the unwrapped one, is available as
-`php74.unwrapped`; see the next section for more details.
+`php81.unwrapped`; see the next section for more details.
 
 Interactive tools built on PHP are put in `php.packages`; composer is
 for example available at `php.packages.composer`.
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
index 5c29f98b28df..5219c1329e36 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
@@ -108,6 +108,12 @@
           <literal>(with foo; isPower &amp;&amp; is32bit &amp;&amp; isBigEndian)</literal>.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          PHP 7.4 is no longer supported due to upstream not supporting
+          this version for the entire lifecycle of the 22.11 release.
+        </para>
+      </listitem>
     </itemizedlist>
   </section>
   <section xml:id="sec-release-22.11-notable-changes">
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md
index 624bde2c83d7..0f04eff7c045 100644
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@@ -45,6 +45,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion.  The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems.  If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`.
 
+- PHP 7.4 is no longer supported due to upstream not supporting this
+  version for the entire lifecycle of the 22.11 release.
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 1064d62da930..6d2525732da0 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -422,7 +422,6 @@ in {
   pgjwt = handleTest ./pgjwt.nix {};
   pgmanage = handleTest ./pgmanage.nix {};
   php = handleTest ./php {};
-  php74 = handleTest ./php { php = pkgs.php74; };
   php80 = handleTest ./php { php = pkgs.php80; };
   php81 = handleTest ./php { php = pkgs.php81; };
   pict-rs = handleTest ./pict-rs.nix {};
diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix
deleted file mode 100644
index 823002978785..000000000000
--- a/pkgs/development/interpreters/php/7.4.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ callPackage, lib, stdenv, ... }@_args:
-
-let
-  base = callPackage ./generic.nix (_args // {
-    version = "7.4.29";
-    sha256 = "sha256-fd5YoCsiXCUTDG4q4su6clS7A0D3/hcpFHgXbYZvlII=";
-  });
-
-in
-base.withExtensions ({ all, ... }: with all; ([
-  bcmath
-  calendar
-  curl
-  ctype
-  dom
-  exif
-  fileinfo
-  filter
-  ftp
-  gd
-  gettext
-  gmp
-  iconv
-  intl
-  json
-  ldap
-  mbstring
-  mysqli
-  mysqlnd
-  opcache
-  openssl
-  pcntl
-  pdo
-  pdo_mysql
-  pdo_odbc
-  pdo_pgsql
-  pdo_sqlite
-  pgsql
-  posix
-  readline
-  session
-  simplexml
-  sockets
-  soap
-  sodium
-  sqlite3
-  tokenizer
-  xmlreader
-  xmlwriter
-  zip
-  zlib
-] ++ lib.optionals (!stdenv.isDarwin) [ imap ]))
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1fc44abf1ab8..30702ade0fbf 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1011,6 +1011,10 @@ mapAliases ({
   phwmon = throw "phwmon has been removed: abandoned by upstream"; # Added 2022-04-24
 
   # Obsolete PHP version aliases
+  php74 = throw "php74 has been dropped due to the lack of maintanence from upstream for future releases"; # Added 2022-05-24
+  php74Packages = php74; # Added 2022-05-24
+  php74Extensions = php74; # Added 2022-05-24
+
   php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases"; # Added 2021-06-03
   php73Packages = php73; # Added 2021-06-03
   php73Extensions = php73; # Added 2021-06-03
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ba232b05b92..d3bfe0189536 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14409,13 +14409,6 @@ with pkgs;
   php80Extensions = recurseIntoAttrs php80.extensions;
   php80Packages = recurseIntoAttrs php80.packages;
 
-  # Import PHP74 interpreter, extensions and packages
-  php74 = callPackage ../development/interpreters/php/7.4.nix {
-    stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
-  };
-  php74Extensions = recurseIntoAttrs php74.extensions;
-  php74Packages = recurseIntoAttrs php74.packages;
-
 
   picoc = callPackage ../development/interpreters/picoc {};