Skip to content

Commit

Permalink
remove php scoped stuff from nix-pkgs fork
Browse files Browse the repository at this point in the history
We can merge this after NixOS/nixpkgs#225401
gets merged to nixpkgs and we run `nix flake update`.
  • Loading branch information
albertchae committed Aug 3, 2023
1 parent 02900b0 commit 1537a3b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 29 deletions.
9 changes: 2 additions & 7 deletions all-packages.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{
newScope,
php-newScope,
...
}: let
{newScope, ...}: let
self = rec {
flarum = php-callPackage ./pkgs/flarum {};
flarum = callPackage ./pkgs/flarum {};
gnunet-messenger-cli = callPackage ./pkgs/gnunet-messenger-cli {};
kikit = callPackage ./pkgs/kikit {};
liberaforms = callPackage ./pkgs/liberaforms {};
Expand All @@ -20,6 +16,5 @@
};

callPackage = newScope (self // nixpkgs-candidates // {inherit callPackage;});
php-callPackage = php-newScope (self // nixpkgs-candidates // {inherit callPackage;});
in
self
19 changes: 1 addition & 18 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
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";
Expand All @@ -13,19 +12,16 @@
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;
php-newScope = php-pkgs.newScope;
};
nixosModules = {
modules = import ./modules/all-modules.nix;
Expand Down

0 comments on commit 1537a3b

Please sign in to comment.