From 26401d463e99de79fda40da1d57ceae7eca8f711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Fri, 17 Nov 2023 12:44:19 +0100 Subject: [PATCH 1/2] phpExtensions.php-spx: change pname to spx --- pkgs/development/php-packages/php-spx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/php-spx/default.nix b/pkgs/development/php-packages/php-spx/default.nix index 52beeacf3bbe..020927ccf491 100644 --- a/pkgs/development/php-packages/php-spx/default.nix +++ b/pkgs/development/php-packages/php-spx/default.nix @@ -4,7 +4,7 @@ let version = "0.4.14"; in buildPecl { inherit version; - pname = "php-spx"; + pname = "spx"; src = fetchFromGitHub { owner = "NoiseByNorthwest"; From f9a2a9f18aaa3441681a3888cf8b127308eb3682 Mon Sep 17 00:00:00 2001 From: Marco Burro Date: Fri, 24 Nov 2023 16:57:56 +0100 Subject: [PATCH 2/2] phpExtensions.php-spx: rename extension and folder Configure allowAliases for old extension name --- pkgs/development/php-packages/{php-spx => spx}/default.nix | 0 pkgs/top-level/php-packages.nix | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) rename pkgs/development/php-packages/{php-spx => spx}/default.nix (100%) diff --git a/pkgs/development/php-packages/php-spx/default.nix b/pkgs/development/php-packages/spx/default.nix similarity index 100% rename from pkgs/development/php-packages/php-spx/default.nix rename to pkgs/development/php-packages/spx/default.nix diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index cda91b8c627b..08e863c38552 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -312,8 +312,6 @@ lib.makeScope pkgs.newScope (self: with self; { phalcon = callPackage ../development/php-packages/phalcon { }; - php-spx = callPackage ../development/php-packages/php-spx { }; - pinba = callPackage ../development/php-packages/pinba { }; protobuf = callPackage ../development/php-packages/protobuf { }; @@ -332,6 +330,8 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) darwin; }; + spx = callPackage ../development/php-packages/spx { }; + sqlsrv = callPackage ../development/php-packages/sqlsrv { }; ssh2 = callPackage ../development/php-packages/ssh2 { }; @@ -345,6 +345,8 @@ lib.makeScope pkgs.newScope (self: with self; { xdebug = callPackage ../development/php-packages/xdebug { }; yaml = callPackage ../development/php-packages/yaml { }; + } // lib.optionalAttrs config.allowAliases { + php-spx = throw "php-spx is deprecated, use spx instead"; } // ( # Core extensions let