From 00dfa9d94e20f3b5da914dbe981801139993e1cf Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 14 Jan 2022 15:07:45 +0100 Subject: [PATCH 1/3] Use `fetchFromGitHub` instead of `fetchurl`. --- pkgs/development/interpreters/php/generic.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index bf2ff11158ecb..349c97970e69e 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -8,7 +8,7 @@ let , stdenv , nixosTests , tests - , fetchurl + , fetchFromGitHub , makeWrapper , symlinkJoin , writeText @@ -296,8 +296,10 @@ let $dev/share/man/man1/ ''; - src = fetchurl { - url = "https://www.php.net/distributions/php-${version}.tar.bz2"; + src = fetchFromGitHub { + owner = "php"; + repo = "php-src"; + rev = "php-${version}"; inherit sha256; }; From bb25d24527e9c796fa0780225a0fbb95aa8a1e99 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 14 Jan 2022 15:17:32 +0100 Subject: [PATCH 2/3] Add `drupol` to the list of PHP maintainers. --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 0743c80ec4f62..6f21c990b509a 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -229,6 +229,7 @@ with lib.maintainers; { php = { members = [ aanderse + drupol etu globin ma27 From 6244f32947224f9779d58af1fc7ed72752f37722 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 14 Jan 2022 15:23:32 +0100 Subject: [PATCH 3/3] Update checksums. --- pkgs/development/interpreters/php/7.4.nix | 2 +- pkgs/development/interpreters/php/8.0.nix | 2 +- pkgs/development/interpreters/php/8.1.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index 1cc63d7b58a42..361c9453a18bc 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -3,7 +3,7 @@ let base = callPackage ./generic.nix (_args // { version = "7.4.26"; - sha256 = "0k803j5wf4jv72px0zqz2z2hxyk2w3jr6xyczy568dx4z2l8i2yn"; + sha256 = "e27179274d50e85babf5e1fbb7ea739a4a923f1d1daff1460b39d6127f6a60cd"; }); in diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 8cf7d4ebc8dfd..3c203d86f7ced 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -3,7 +3,7 @@ let base = callPackage ./generic.nix (_args // { version = "8.0.13"; - sha256 = "0djqh650clz4fy1zifazf0jq383znksydx23f1s48prrlixrshf2"; + sha256 = "ee1369199b26fc088ce6f51c111be0fbb42d1b10b107437c782a4701c0ea673f"; }); in diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 736d6c808cde4..cacfdc9e718ef 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -3,7 +3,7 @@ let base = callPackage ./generic.nix (_args // { version = "8.1.1"; - sha256 = "sha256-j4vJytbNEk7cER99sKEJdF4vY4dwoQGzwiopU/eptA4="; + sha256 = "0nyk0r1rlcamn1f6d6kk1fw3bmbrfcdjixx0b9hkh58b1vpj60hq"; }); in