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

Revert "php/generic: Allow to extend PHP_INI_SCAN_DIR" #127677

Merged
merged 1 commit into from
Jun 22, 2021

Conversation

talyz
Copy link
Contributor

@talyz talyz commented Jun 21, 2021

Reverts #125405, which causes issues when PHP is wrapped multiple times, since the same configuration file can end up being loaded multiple times, causing major issues.

@talyz talyz requested a review from ajs124 June 21, 2021 14:06
@talyz talyz changed the title [21.05] Revert "php/generic: Allow to extend PHP_INI_SCAN_DIR" Revert "php/generic: Allow to extend PHP_INI_SCAN_DIR" Jun 21, 2021
@r-rmcgibbo
Copy link

r-rmcgibbo commented Jun 21, 2021

Result of nixpkgs-review pr 127677 at 0d9496f run on aarch64-linux 1

2 packages marked as broken and skipped:
  • pulseeffects-legacy
  • pulseeffects-pw
1 package failed to build:
20 packages built successfully:
  • adminer
  • php (apacheHttpdPackages.php ,php80)
  • arcanist
  • bookstack
  • drush
  • engelsystem
  • icingaweb2
  • libsForQt5.kcachegrind (libsForQt515.kcachegrind ,plasma5Packages.kcachegrind)
  • libsForQt514.kcachegrind
  • lsp-plugins
  • matomo
  • matomo-beta
  • nagios
  • nextcloud-news-updater
  • phoronix-test-suite
  • php74
  • qcachegrind
  • unit
  • wp-cli
  • yle-dl
1 suggestion:
  • warning: missing-patch-comment

    Consider adding a comment explaining the purpose of this patch on the line preceeding.
    Near pkgs/development/interpreters/php/generic.nix:260:19:

        |
    260 |       patches = [ ./fix-paths-php7.patch ] ++ extraPatches;
        |                   ^
    

Note that build failures may predate this PR, and could be nondeterministic or hardware dependent.
Please exercise your independent judgement. Does something look off? Please file an issue or reach out on IRC.


Result of nixpkgs-review pr 127677 at 0d9496f run on x86_64-linux 1

1 package failed to build:
1 package skipped due to time constraints:
  • libsForQt512.kcachegrind
45 packages built successfully:
  • adminer
  • php (apacheHttpdPackages.php ,php80)
  • arcanist
  • bookstack
  • drush
  • engelsystem
  • icingaweb2
  • libsForQt5.kcachegrind (libsForQt515.kcachegrind ,plasma5Packages.kcachegrind)
  • libsForQt514.kcachegrind
  • lsp-plugins
  • matomo
  • matomo-beta
  • nagios
  • nextcloud-news-updater
  • phoronix-test-suite
  • php74
  • php74Packages.box
  • php74Packages.composer
  • php74Packages.deployer
  • php74Packages.php-cs-fixer
  • php74Packages.php-parallel-lint
  • php74Packages.phpcbf
  • php74Packages.phpcs
  • php74Packages.phpmd
  • php74Packages.phpstan
  • php74Packages.psalm
  • php74Packages.psysh
  • php80Packages.box
  • php80Packages.composer
  • php80Packages.deployer
  • php80Packages.php-cs-fixer
  • php80Packages.php-parallel-lint
  • php80Packages.phpcbf
  • php80Packages.phpcs
  • php80Packages.phpmd
  • php80Packages.phpstan
  • php80Packages.psalm
  • php80Packages.psysh
  • pulseeffects-legacy
  • pulseeffects-pw
  • qcachegrind
  • rss-bridge-cli
  • unit
  • wp-cli
  • yle-dl
1 suggestion:
  • warning: missing-patch-comment

    Consider adding a comment explaining the purpose of this patch on the line preceeding.
    Near pkgs/development/interpreters/php/generic.nix:260:19:

        |
    260 |       patches = [ ./fix-paths-php7.patch ] ++ extraPatches;
        |                   ^
    

Note that build failures may predate this PR, and could be nondeterministic or hardware dependent.
Please exercise your independent judgement. Does something look off? Please file an issue or reach out on IRC.

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Jun 22, 2021

Shouldn't the default revert command add the hash of the reverted commit into the message?

@drupol
Copy link
Contributor

drupol commented Jun 22, 2021

Yes, the default log message contains the reverted commit ID, and it is possible to edit it.

Another revert that has been committed: af2d542

@SuperSandro2000 SuperSandro2000 merged commit b4b3372 into master Jun 22, 2021
@SuperSandro2000 SuperSandro2000 deleted the revert-125405-patch-1 branch June 22, 2021 16:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants