Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BLOCKED] Use buildComposerProject from upstream nixpkgs #33

Closed
wants to merge 1 commit into from
Closed

[BLOCKED] Use buildComposerProject from upstream nixpkgs #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions all-packages.nix
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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
Loading