Package flarum

Co-authored-by: Jason Odoom <[email protected]> Co-authored-by: Anish Lakhwara <[email protected]> Co-authored-by: Dominic Mills <[email protected]> Co-authored-by: Albert Chae <[email protected]> Co-authored-by: Jack Leightcap <[email protected]> Signed-off-by: Jack Leightcap <[email protected]>
ngi-nix · Aug 3, 2023 · 02900b0 · 02900b0
1 parent 3aca76e
commit 02900b0
Show file tree

Hide file tree

Showing 5 changed files with 9,459 additions and 5 deletions.
diff --git a/all-packages.nix b/all-packages.nix
@@ -1,10 +1,15 @@
-{newScope, ...}: let
+{
+  newScope,
+  php-newScope,
+  ...
+}: let
   self = rec {
-    libgnunetchat = callPackage ./pkgs/libgnunetchat {};
+    flarum = php-callPackage ./pkgs/flarum {};
     gnunet-messenger-cli = callPackage ./pkgs/gnunet-messenger-cli {};
+    kikit = callPackage ./pkgs/kikit {};
     liberaforms = callPackage ./pkgs/liberaforms {};
     liberaforms-env = callPackage ./pkgs/liberaforms/env.nix {};
-    kikit = callPackage ./pkgs/kikit {};
+    libgnunetchat = callPackage ./pkgs/libgnunetchat {};
   };
 
   nixpkgs-candidates = {
@@ -15,5 +20,6 @@
   };
 
   callPackage = newScope (self // nixpkgs-candidates // {inherit callPackage;});
+  php-callPackage = php-newScope (self // nixpkgs-candidates // {inherit callPackage;});
 in
   self
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,6 +2,7 @@
   description = "NgiPkgs";
 
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+  inputs.php-nixpkgs.url = "github:drupol/nixpkgs?ref=php/add-new-builder";
   inputs.flake-utils.url = "github:numtide/flake-utils";
   # Set the defaultSystem list for flake-utils to only x86_64-linux
   inputs.systems.url = "github:nix-systems/x86_64-linux";
@@ -12,15 +13,20 @@
   outputs = {
     self,
     nixpkgs,
+    php-nixpkgs,
     flake-utils,
     treefmt-nix,
     ...
   }: let
     buildOutputs = system: let
       pkgs = nixpkgs.legacyPackages.${system};
+      php-pkgs = php-nixpkgs.legacyPackages.${system};
       treefmtEval = treefmt-nix.lib.evalModule pkgs ./treefmt.nix;
     in {
-      packages = import ./all-packages.nix {inherit (pkgs) newScope;};
+      packages = import ./all-packages.nix {
+        inherit (pkgs) newScope;
+        php-newScope = php-pkgs.newScope;
+      };
       nixosModules = {
         modules = import ./modules/all-modules.nix;
         ngipkgs = {...}: {