Merge branch '1.0-develop' into fix/4360

pterodactyl · Mar 20, 2024 · 76cc289 · 76cc289
2 parents 747b7e2 + 2497819
commit 76cc289
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 190 deletions.
diff --git a/README.md b/README.md
@@ -27,12 +27,14 @@ Stop settling for less. Make game servers a first class citizen on your platform
 I would like to extend my sincere thanks to the following sponsors for helping fund Pterodactyl's development.
 [Interested in becoming a sponsor?](https://github.com/sponsors/matthewpi)
 
-| Company                                                   | About                                                                                                                                                                                                 |
-|-----------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| [**Aussie Server Hosts**](https://aussieserverhosts.com/) | No frills Australian Owned and operated High Performance Server hosting for some of the most demanding games serving Australia and New Zealand.                                                       |
-| [**BisectHosting**](https://www.bisecthosting.com/)       | BisectHosting provides Minecraft, Valheim and other server hosting services with the highest reliability and lightning fast support since 2012.                                                       |
-| [**MineStrator**](https://minestrator.com/)               | Looking for the most highend French hosting company for your minecraft server? More than 24,000 members on our discord trust us. Give us a try!                                                       |
-| [**VibeGAMES**](https://vibegames.net/)                   | VibeGAMES is a game server provider that specializes in DDOS protection for the games we offer. We have multiple locations in the US, Brazil, France, Germany, Singapore, Australia and South Africa. |
+| Company                                                   | About                                                                                                                                                                                                                                           |
+|-----------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [**Aussie Server Hosts**](https://aussieserverhosts.com/) | No frills Australian Owned and operated High Performance Server hosting for some of the most demanding games serving Australia and New Zealand.                                                                                                 |
+| [**BisectHosting**](https://www.bisecthosting.com/)       | BisectHosting provides Minecraft, Valheim and other server hosting services with the highest reliability and lightning fast support since 2012.                                                                                                 |
+| [**MineStrator**](https://minestrator.com/)               | Looking for the most highend French hosting company for your minecraft server? More than 24,000 members on our discord trust us. Give us a try!                                                                                                 |
+| [**VibeGAMES**](https://vibegames.net/)                   | VibeGAMES is a game server provider that specializes in DDOS protection for the games we offer. We have multiple locations in the US, Brazil, France, Germany, Singapore, Australia and South Africa.                                           |
+| [**HostEZ**](https://hostez.io)                           | US & EU Rust & Minecraft Hosting. DDoS Protected bare metal, VPS and colocation with low latency, high uptime and maximum availability. EZ!                                                                                                     |
+| [**Blueprint**](https://blueprint.zip/?pterodactyl=true)  | Create and install Pterodactyl addons and themes with the growing Blueprint framework - the package-manager for Pterodactyl. Use multiple modifications at once without worrying about conflicts and make use of the large extension ecosystem. |
 
 ### Supported Games
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -39,7 +39,10 @@
         pkgs = import nixpkgs {inherit system;};
         mkNodePackage = mk-node-package.lib."${system}".mkNodePackage;
 
-        php81WithExtensions = with pkgs; (php81.buildEnv {
+        php = pkgs.php; # PHP 8.2
+        phpPackages = pkgs.phpPackages; # PHP 8.2
+
+        phpWithExtensions = php.buildEnv {
           extensions = {
             enabled,
             all,
@@ -52,8 +55,8 @@
           extraConfig = ''
             xdebug.mode=debug
           '';
-        });
-        composer = with pkgs; (php81Packages.composer.override {php = php81WithExtensions;});
+        };
+        composer = phpPackages.composer.override {php = phpWithExtensions;};
 
         caCertificates = pkgs.runCommand "ca-certificates" {} ''
           mkdir -p $out/etc/ssl/certs $out/etc/pki/tls/certs
@@ -201,7 +204,7 @@
         };
       in {
         defaultPackage = panel;
-        devShell = import ./shell.nix {inherit composer php81WithExtensions pkgs;};
+        devShell = import ./shell.nix {inherit composer phpWithExtensions pkgs;};
 
         packages = {
           inherit panel;
@@ -224,7 +227,7 @@
                   mysql80
                   nodejs_18
                   nodePackages.yarn
-                  php81WithExtensions
+                  phpWithExtensions
                 ];
                 pathsToLink = ["/bin" "/etc"];
               };
@@ -242,7 +245,7 @@
                   caCertificates
                   caddy
                   configs
-                  php81WithExtensions
+                  phpWithExtensions
 
                   panel
                 ];

diff --git a/shell.nix b/shell.nix
@@ -1,6 +1,6 @@
 {
   composer ? null,
-  php81WithExtensions ? null,
+  phpWithExtensions ? null,
   pkgs ? import <nixpkgs> {},
 }:
 with pkgs;
@@ -10,7 +10,7 @@ with pkgs;
       composer
       nodejs_18
       nodePackages.yarn
-      php81WithExtensions
+      phpWithExtensions
     ];
 
     shellHook = ''