Skip to content

Commit

Permalink
Merge pull request #248 from loophp/push-mvkmsotxyutp
Browse files Browse the repository at this point in the history
refactor: remove `php-src-nix`, I don't have time to take care of it
  • Loading branch information
loophp-bot authored Dec 1, 2024
2 parents fd9bf8f + a8a8fe3 commit 3947c69
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 184 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ building those PHP packages yourself.

```shell
cachix use nix-shell
cachix use php-src-nix
```

This project also provides a basic template for PHP projects, to use it, run:
Expand Down
199 changes: 23 additions & 176 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 @@ -4,7 +4,6 @@
inputs = {
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";
Expand Down Expand Up @@ -33,10 +32,7 @@
perSystem =
{
self',
inputs',
config,
pkgs,
system,
lib,
...
}:
Expand Down
4 changes: 1 addition & 3 deletions src/overlay/phps.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ 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
) nix-phps

0 comments on commit 3947c69

Please sign in to comment.