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.

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

flarum: package definition #32

Merged
merged 1 commit into from
Aug 3, 2023
Merged

flarum: package definition #32

merged 1 commit into from
Aug 3, 2023

Conversation

albertchae
Copy link
Contributor

@albertchae albertchae commented Aug 1, 2023

Towards #10

First attempt here: #23

This PR uses that builder, and so includes some additional temporary inputs in flake.nix. To use buildComposerProject without an upstream composer.lock, we've had to commit a valid lockfile locally to the package definition. composer create-project flarum/flarum . yields a valid lockfile

Once the draft PHP builder PR is merged, they can be removed.
PR with patch: #33

flake.nix Outdated Show resolved Hide resolved
@@ -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";
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the fork/branch for NixOS/nixpkgs#225401. Ideally once that PR is merged, we can just use the same nixpkgs as everything else and remove this php-nixpkgs param

@jleightcap jleightcap force-pushed the moss-flarum-2 branch 6 times, most recently from e7a12e5 to f102e89 Compare August 2, 2023 14:32
@jleightcap jleightcap changed the title Package flarum flarum: package definition Aug 3, 2023
@@ -15,5 +20,6 @@
};

callPackage = newScope (self // nixpkgs-candidates // {inherit callPackage;});
php-callPackage = php-newScope (self // nixpkgs-candidates // {inherit callPackage;});
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because packaging flarum required us to point to a different fork of nixpkgs, we defined a separate callPackage that uses that fork

Co-authored-by: Jason Odoom <jasonodoom@gmail.com>
Co-authored-by: Anish Lakhwara <anish+git@lakhwara.com>
Co-authored-by: Dominic Mills <dominic.millz27@gmail.com>
Co-authored-by: Albert Chae <albertchae@users.noreply.github.com>
Co-authored-by: Jack Leightcap <jack@leightcap.com>
Signed-off-by: Jack Leightcap <jack@leightcap.com>
@albertchae albertchae marked this pull request as ready for review August 3, 2023 22:51
@albertchae albertchae merged commit 7cb3e2b into main Aug 3, 2023
2 checks passed
@albertchae albertchae deleted the moss-flarum-2 branch August 3, 2023 22:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: mobleted
Development

Successfully merging this pull request may close these issues.

None yet

1 participant