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

refactor: use overlay #157

Merged
merged 2 commits into from
Aug 3, 2023
Merged

Conversation

drupol
Copy link
Contributor

@drupol drupol commented Jun 29, 2023

This PR

  • [x]
  • [ ]
  • [ ]

Follows #.
Related to #.
Fixes #.

@what-the-diff
Copy link

what-the-diff bot commented Jun 29, 2023

PR Summary

Changes to flake.nix:

  • Changed source of nix-phps.url
    The source from which the software package nix-phps is pulled, has been changed from GitHub to a local directory.
  • Reordered systems list
    The order of systems listed has been adjusted for more efficient organization or execution.
  • Included 'easyOverlay' to imports
    A new module identified as easyOverlay from inputs.flake-parts.flakeModules has been added to the imports list.
  • Refactored the perSystem function
    The way variables are defined in the perSystem function has been changed to use a let keyword instead of an = (equals) sign, increasing flexibility when determining what value should be assigned to phps.
  • Updated sections in the perSystem function
    The packages and devShells sections now use advanced built-in functions to process data, resulting in a more efficient organization or execution.
  • Included self.overlays.default in overlays
    The overlays list in _module.args.pkgs now includes self.overlays.default, potentially providing more functionality or compatibility.

Changes to src/phps.nix:

  • Updated function parameters
    The parameters used by all functions have been updated to use a consistent { self, inputs, ... } format, providing clear and consistent access to necessary variables.
  • Refined makePhp function
    Definitions within the makePhp function will now be done using let instead of =, matching the update in flake.nix. Also, rather than calling pkgsWithNixPhps, makePhp will now directly import pkgs from inputs.nixpkgs.
  • Simplified extension binding
    The handling of PHP extensions has been simplified and streamlined, removing a distinct binding for composerExtensions and filtering extensions more effectively.
  • Streamlined use of php variable
    Instances of phpConfig have been replaced with php for a more direct reference to the language configurations.
  • Improved extension function
    The extensions function has been updated to call buildExtensions with the necessary arguments and the enabled variable, removing reliance on a filtered extensions list.
  • Relocated and updated makePhp function
    The makePhp function has been moved to the top of the file and adjusted to incorporate { self, inputs, ... } in its function signature for improved clarity and consistency.

@drupol drupol force-pushed the refactor/use-overlay-and-simplifications branch 13 times, most recently from 98c03d9 to 560df67 Compare June 29, 2023 19:23
@drupol drupol force-pushed the refactor/use-overlay-and-simplifications branch 10 times, most recently from 5bfdab4 to 142d874 Compare July 10, 2023 08:42
@drupol drupol force-pushed the refactor/use-overlay-and-simplifications branch 4 times, most recently from 73608d3 to af4c9a3 Compare July 13, 2023 17:00
@drupol drupol force-pushed the refactor/use-overlay-and-simplifications branch 4 times, most recently from 6d434b6 to 10f2a79 Compare July 17, 2023 20:45
@drupol drupol force-pushed the refactor/use-overlay-and-simplifications branch 4 times, most recently from 5947458 to 658a297 Compare July 24, 2023 08:47
@drupol drupol force-pushed the refactor/use-overlay-and-simplifications branch from 658a297 to 13f5eab Compare August 3, 2023 19:54
…here

Also do not fail when an extensions fails to instantiate, just print a warning.
…ed until broken ones (eg: couchbase) are fixed upstream
@drupol drupol force-pushed the refactor/use-overlay-and-simplifications branch from 13f5eab to a1a871b Compare August 3, 2023 19:56
@drupol drupol marked this pull request as ready for review August 3, 2023 19:57
@drupol drupol merged commit d2940b4 into master Aug 3, 2023
3 checks passed
@drupol drupol deleted the refactor/use-overlay-and-simplifications branch August 3, 2023 19:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant