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.

Sign up for GitHub

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

Jump to bottom

php: added argon2 option for php 7.2+ #46785

Merged
merged 3 commits into from Sep 17, 2018
Merged

php: added argon2 option for php 7.2+ #46785

merged 3 commits into from Sep 17, 2018

Conversation

aanderse
Copy link
Member

@aanderse aanderse commented Sep 17, 2018 •
edited

Motivation for this change

The Argon2 algorithm is not enabled in php on NixOS.
I would like this change to be included with 18.09 if possible.

http://php.net/manual/en/password.constants.php
https://bugs.php.net/bug.php?id=76360

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@Mic92
Copy link
Member

Mic92 commented Sep 17, 2018

cc @etu

@etu
Copy link
Contributor

etu commented Sep 17, 2018

@GrahamcOfBorg build php72

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: php72

Partial log (click to expand)

/nix/store/kri8ivhzv0zixxzhgqyg6w33b67srm1x-php-7.2.10/lib/build/config.guess: interpreter directive changed from " /bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
/nix/store/kri8ivhzv0zixxzhgqyg6w33b67srm1x-php-7.2.10/lib/build/shtool: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
/nix/store/kri8ivhzv0zixxzhgqyg6w33b67srm1x-php-7.2.10/lib/build/config.sub: interpreter directive changed from " /bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/kri8ivhzv0zixxzhgqyg6w33b67srm1x-php-7.2.10...
moving /nix/store/kri8ivhzv0zixxzhgqyg6w33b67srm1x-php-7.2.10/sbin/* to /nix/store/kri8ivhzv0zixxzhgqyg6w33b67srm1x-php-7.2.10/bin
shrinking RPATHs of ELF executables and libraries in /nix/store/0ad4k29fbz1pp4mc36q7vpv2z6c1hhay-php-7.2.10-dev
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/0ad4k29fbz1pp4mc36q7vpv2z6c1hhay-php-7.2.10-dev
checking for references to /build in /nix/store/0ad4k29fbz1pp4mc36q7vpv2z6c1hhay-php-7.2.10-dev...
/nix/store/kri8ivhzv0zixxzhgqyg6w33b67srm1x-php-7.2.10

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: php72

Partial log (click to expand)

/nix/store/0qj01qzrxx9sfnx3gdyq180bnyc5c955-php-7.2.10/bin/pear: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
/nix/store/0qj01qzrxx9sfnx3gdyq180bnyc5c955-php-7.2.10/bin/php-config: interpreter directive changed from " /bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
/nix/store/0qj01qzrxx9sfnx3gdyq180bnyc5c955-php-7.2.10/bin/phpize: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/0qj01qzrxx9sfnx3gdyq180bnyc5c955-php-7.2.10...
moving /nix/store/0qj01qzrxx9sfnx3gdyq180bnyc5c955-php-7.2.10/sbin/* to /nix/store/0qj01qzrxx9sfnx3gdyq180bnyc5c955-php-7.2.10/bin
shrinking RPATHs of ELF executables and libraries in /nix/store/xc2ba62kp3n4rs68x8v44k6nq77pa08j-php-7.2.10-dev
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/xc2ba62kp3n4rs68x8v44k6nq77pa08j-php-7.2.10-dev
checking for references to /build in /nix/store/xc2ba62kp3n4rs68x8v44k6nq77pa08j-php-7.2.10-dev...
/nix/store/0qj01qzrxx9sfnx3gdyq180bnyc5c955-php-7.2.10

@etu
Copy link
Contributor

etu commented Sep 17, 2018

@GrahamcOfBorg build php71

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: php71

Partial log (click to expand)

/nix/store/fsy37l7pf4n8cpxdxz3bwgqmcb5m9j8s-php-7.1.22

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: php71

Partial log (click to expand)

these paths will be fetched (16.45 MiB download, 72.55 MiB unpacked):
  /nix/store/fh2rz2r4zzyw4waki8iy4ymzsg3ilb0r-php-7.1.22
copying path '/nix/store/fh2rz2r4zzyw4waki8iy4ymzsg3ilb0r-php-7.1.22' from 'https://cache.nixos.org'...
/nix/store/fh2rz2r4zzyw4waki8iy4ymzsg3ilb0r-php-7.1.22

@etu
Copy link
Contributor

etu commented Sep 17, 2018

@Mic92 Looks good to me, I'm fine with backporting this since it's supported by upstream and is in general a good feature. I don't know about other's opinions though.

If you backport this, make sure to not bring the php72 and php71 updates to 7.1.10 and 7.1.22 because of this: https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/interpreters/php/default.nix#L40-L43

@etu
Copy link
Contributor

etu commented Sep 17, 2018

@aanderse One note though, it would be nice if you can amend the commit message to something like php: add option to enable argon2

@aanderse
Copy link
Member Author

@Mic92 Looks good to me, I'm fine with backporting this since it's supported by upstream and is in general a good feature. I don't know about other's opinions though.

If you backport this, make sure to not bring the php72 and php71 updates to 7.1.10 and 7.1.22 because of this: https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/interpreters/php/default.nix#L40-L43

Just to be sure, I should be basing this change against the staging-18.09 branch, not the release-18.09 branch?

@aanderse
Copy link
Member Author

aanderse commented Sep 17, 2018 •
edited

@aanderse One note though, it would be nice if you can amend the commit message to something like php: add option to enable argon2

@etu OK should be good to go. You're happy to merge?

@etu
Copy link
Contributor

etu commented Sep 17, 2018

@aanderse Now you have three commits instead of one https://github.com/NixOS/nixpkgs/pull/46785/commits

You seem to have keeped your original commit instead of amending it and then causing a merge.

I don't have merge rights, that's why I ping @Mic92 about merging/backporting things. But he can probably sort out your commits as well unless you do it.

@globin globin merged commit e48811f into NixOS:master Sep 17, 2018
@aanderse aanderse deleted the php-libargon2 branch September 17, 2018 17:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@aanderse @Mic92 @etu @GrahamcOfBorg @globin