From f035fa6ede597fa9473783382b594b94ed54fff4 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 3 Jun 2021 17:10:38 +0200
Subject: [PATCH 1/5] php74: 7.4.18 -> 7.4.20

https://www.php.net/ChangeLog-7.php#7.4.19
https://www.php.net/ChangeLog-7.php#7.4.20
(cherry picked from commit 23548b255290bdeb90f5caebb1ac306a1b323e28)
---
 pkgs/development/interpreters/php/7.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix
index dd5c6452a5e..79e736b30d5 100644
--- a/pkgs/development/interpreters/php/7.4.nix
+++ b/pkgs/development/interpreters/php/7.4.nix
@@ -4,8 +4,8 @@ let
   generic = (import ./generic.nix) _args;
 
   base = callPackage generic (_args // {
-    version = "7.4.18";
-    sha256 = "0bw4q7svijsqi5vinaspzzqyli2pvmpz6yf83ndqixf6x4r5ji9f";
+    version = "7.4.20";
+    sha256 = "0d5ncz97y0271dsmz269wl4721vhq2fn6pmm9rxglc756p36pnha";
   });
 
 in base.withExtensions ({ all, ... }: with all; ([

From f11b59b21b237685dd7fa3893943cf00c62ff98d Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 3 Jun 2021 17:11:10 +0200
Subject: [PATCH 2/5] php80: 8.0.5 -> 8.0.6

https://www.php.net/ChangeLog-8.php#8.0.6
(cherry picked from commit a3c966cc7aefe169fc0d6a73dd2f0d765177c23b)
---
 pkgs/development/interpreters/php/8.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix
index 5e392549e02..7f61169b811 100644
--- a/pkgs/development/interpreters/php/8.0.nix
+++ b/pkgs/development/interpreters/php/8.0.nix
@@ -4,8 +4,8 @@ let
   generic = (import ./generic.nix) _args;
 
   base = callPackage generic (_args // {
-    version = "8.0.5";
-    sha256 = "1q08xx9pbn7plsnfh6j16jj294vm968ng1n5kaqw7apgxd7r6p8r";
+    version = "8.0.6";
+    sha256 = "0vjji49a8pbhzy1q6l4id95ixar2dqf1bkqbxffh64k0svdaka16";
   });
 
 in base.withExtensions ({ all, ... }: with all; ([

From fb4f4addaf671a894e4b27ab67ad20451ed8f7da Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 3 Jun 2021 20:46:34 +0200
Subject: [PATCH 3/5] php.packages.composer: 2.0.13 -> 2.1.0

(cherry picked from commit 5880c1c4bf29b4040d4464c592bc1d0b75adbfcf)
---
 pkgs/development/php-packages/composer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix
index 6a9cffa8ae7..65f48fd2785 100644
--- a/pkgs/development/php-packages/composer/default.nix
+++ b/pkgs/development/php-packages/composer/default.nix
@@ -1,14 +1,14 @@
 { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
 let
   pname = "composer";
-  version = "2.0.13";
+  version = "2.1.0";
 in
 mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "https://getcomposer.org/download/${version}/composer.phar";
-    sha256 = "sha256-EW/fB8ySavZGY1pqvJLYiv97AqXcNlOPgcUKfSc2bb8=";
+    sha256 = "0vp1pnf2zykszhyv36gl4j3013z4fqv9yqj9llvbvmmm9ml8z3ig";
   };
 
   dontUnpack = true;

From f8455aefe9414323188c55e38f6d75b5ac1972d4 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas.gerbet@enalean.com>
Date: Fri, 4 Jun 2021 09:27:47 +0200
Subject: [PATCH 4/5] phpPackages.composer: 2.1.0 -> 2.1.1

https://github.com/composer/composer/releases/tag/2.1.1
(cherry picked from commit 5ae9ac3e88ee9ecfde695c83ddfd7ca42d8d5f09)
---
 pkgs/development/php-packages/composer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix
index 65f48fd2785..f81ee3005f7 100644
--- a/pkgs/development/php-packages/composer/default.nix
+++ b/pkgs/development/php-packages/composer/default.nix
@@ -1,14 +1,14 @@
 { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
 let
   pname = "composer";
-  version = "2.1.0";
+  version = "2.1.1";
 in
 mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "https://getcomposer.org/download/${version}/composer.phar";
-    sha256 = "0vp1pnf2zykszhyv36gl4j3013z4fqv9yqj9llvbvmmm9ml8z3ig";
+    sha256 = "1ki106973q74inwgd4hjmml905rqg82808qq4wiysrkr7mzmfnj4";
   };
 
   dontUnpack = true;

From 02957ca57b212ff61d79ceb46cf2f3c99c9e2320 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Fri, 4 Jun 2021 13:40:35 +0200
Subject: [PATCH 5/5] php80: 8.0.6 -> 8.0.7

https://www.php.net/ChangeLog-8.php#8.0.7
(cherry picked from commit 6b7b002544a8c0f907a37eeb4fd77eecd8c7eb67)
---
 pkgs/development/interpreters/php/8.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix
index 7f61169b811..9d357f88afe 100644
--- a/pkgs/development/interpreters/php/8.0.nix
+++ b/pkgs/development/interpreters/php/8.0.nix
@@ -4,8 +4,8 @@ let
   generic = (import ./generic.nix) _args;
 
   base = callPackage generic (_args // {
-    version = "8.0.6";
-    sha256 = "0vjji49a8pbhzy1q6l4id95ixar2dqf1bkqbxffh64k0svdaka16";
+    version = "8.0.7";
+    sha256 = "0yazcc9x66xg1gmi3rpgk891g6s3mm7aywcadqfqnx1mdz4z5ckj";
   });
 
 in base.withExtensions ({ all, ... }: with all; ([