-
-
Notifications
You must be signed in to change notification settings - Fork 14.1k
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
pypy{27,38,39}: refactor derivation #209675
Conversation
Result of 4 packages built:
|
Result of 1 package blacklisted:
4 packages built:
|
@ofborg build pypy27 pypy38 pypy39 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Waiting my local machine.
@ofborg build pypy27 pypy38 pypy39 |
Oops, doesn't work on aarch64-darwin. EDIT: But ofborg passes there. I tested on my machine against pypy27 and found that the aarch64-darwin part should be moved to preFixup = lib.optionalString (stdenv.isDarwin) ''
install_name_tool -change @rpath/lib${executable}-c.dylib $out/lib/lib${executable}-c.dylib $out/bin/${executable}
'' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
mkdir -p $out/${executable}-c/pypy/bin
mv $out/bin/${executable} $out/${executable}-c/pypy/bin/${executable}
ln -s $out/${executable}-c/pypy/bin/${executable} $out/bin/${executable}
''; |
LGTM. |
- Remove code related to i686 archs (not supported anymore since #209100) - Split non-install steps in installPhase in installCheckPhase/preFixup - Add missing pre/post hooks
This comment was marked as outdated.
This comment was marked as outdated.
Result of 4 packages built:
|
@ofborg build pypy27 pypy38 pypy39 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
$ ls result/bin
pypy3 pypy3.9
$ result/bin/pypy3
Python 3.9.16 (feeb267ead3e6771d3f2f49b83e1894839f64fb7, Jan 08 2023, 19:32:57)
[PyPy 7.3.11 with GCC Clang 11.1.0] on darwin
Type "help", "copyright", "credits" or "license" for more information.
>>>>
$ result/bin/pypy3.9
Python 3.9.16 (feeb267ead3e6771d3f2f49b83e1894839f64fb7, Jan 08 2023, 19:32:57)
[PyPy 7.3.11 with GCC Clang 11.1.0] on darwin
Type "help", "copyright", "credits" or "license" for more information.
>>>>
Timeout in @ofborg build pypy27 pypy38 pypy39 |
Looks good on ofborg. |
Description of changes
with lib;
usage (Tracking issue: remove overuses ofwith lib;
#208242)Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes