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

pypy{27,38,39}: refactor derivation #209675

Merged
merged 5 commits into from
Jan 8, 2023
Merged

pypy{27,38,39}: refactor derivation #209675

merged 5 commits into from
Jan 8, 2023

Conversation

thiagokokada
Copy link
Contributor

@thiagokokada thiagokokada commented Jan 8, 2023

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@thiagokokada
Copy link
Contributor Author

Result of nixpkgs-review pr 209675 run on x86_64-linux 1

4 packages built:
  • cvs2svn
  • pypy
  • pypy3
  • pypy38

@thiagokokada
Copy link
Contributor Author

Result of nixpkgs-review pr 209675 run on x86_64-darwin 1

1 package blacklisted:
  • tests.writers
4 packages built:
  • cvs2svn
  • pypy (pypy2 ,pypy27)
  • pypy3 (pypy39)
  • pypy38

@thiagokokada
Copy link
Contributor Author

CC @AndersonTorres

@thiagokokada
Copy link
Contributor Author

@ofborg build pypy27 pypy38 pypy39

Copy link
Member

@AndersonTorres AndersonTorres left a 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.

@thiagokokada
Copy link
Contributor Author

@ofborg build pypy27 pypy38 pypy39

@wegank
Copy link
Member

wegank commented Jan 8, 2023

Oops, doesn't work on aarch64-darwin. I guess #209699 was too immature.

EDIT: But ofborg passes there. I tested on my machine against pypy27 and found that the aarch64-darwin part should be moved to preFixup, after the install_name_tool block:

  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}
  '';

@AndersonTorres
Copy link
Member

LGTM.

@thiagokokada

This comment was marked as outdated.

@thiagokokada
Copy link
Contributor Author

Result of nixpkgs-review pr 209675 run on x86_64-linux 1

4 packages built:
  • cvs2svn
  • pypy
  • pypy3
  • pypy38

@thiagokokada
Copy link
Contributor Author

@ofborg build pypy27 pypy38 pypy39

Copy link
Member

@wegank wegank left a 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.
>>>> 

@thiagokokada
Copy link
Contributor Author

Timeout in aarch64-linux, let me try again.

@ofborg build pypy27 pypy38 pypy39

@wegank
Copy link
Member

wegank commented Jan 8, 2023

Looks good on ofborg.

@thiagokokada thiagokokada merged commit 4b76643 into NixOS:master Jan 8, 2023
@thiagokokada thiagokokada deleted the pypy-refactor branch January 8, 2023 22:41
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.

3 participants