Skip to content

Commit

Permalink
Revert "fix: remove loophp/php-src-nix for now on"
Browse files Browse the repository at this point in the history
This reverts commit 8a238ce.
  • Loading branch information
drupol committed Jun 12, 2024
1 parent 8a238ce commit 47ad2ce
Show file tree
Hide file tree
Showing 4 changed files with 180 additions and 20 deletions.
12 changes: 0 additions & 12 deletions composer.json

This file was deleted.

160 changes: 156 additions & 4 deletions flake.lock

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

14 changes: 11 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,23 @@
description = "PHP/Composer/SymfonyCLi/GithubCLi/git/sqlite/make";

inputs = {
flake-parts.url = "github:hercules-ci/flake-parts";
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nix-phps.url = "github:fossar/nix-phps";
php-src-nix.url = "github:loophp/php-src-nix";
# Shim to make flake.nix work with stable Nix.
flake-compat.url = "github:nix-community/flake-compat";
systems.url = "github:nix-systems/default";
};

outputs =
inputs@{ self, flake-parts, ... }:
inputs@{
self,
flake-parts,
systems,
...
}:
flake-parts.lib.mkFlake { inherit inputs; } {
systems = import inputs.systems;
systems = import systems;

imports = [
./src/imports/formatter.nix
Expand All @@ -28,7 +33,10 @@
perSystem =
{
self',
inputs',
config,
pkgs,
system,
lib,
...
}:
Expand Down
14 changes: 13 additions & 1 deletion src/overlay/phps.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,16 @@ inputs:

final: prev:

(inputs.nix-phps.overlays.default final prev)
let
buildPhpFromComposer = (inputs.self.overlays.default final prev).api.buildPhpFromComposer;
nix-phps = inputs.nix-phps.overlays.default final prev;
php-src-nix-snapshot = inputs.php-src-nix.overlays.snapshot final prev;
in
builtins.mapAttrs (
name: value:
buildPhpFromComposer {
php = value;
src = inputs.self;
}
) php-src-nix-snapshot
// nix-phps

0 comments on commit 47ad2ce

Please sign in to comment.