Skip to content

Fix pythonInterpreters.pypy27_prebuilt, pythonInterpreters.pypy36_prebuilt#113134

Merged
FRidh merged 2 commits intoNixOS:masterfrom
andersk:pypy_prebuilt
Feb 20, 2021
Merged

Fix pythonInterpreters.pypy27_prebuilt, pythonInterpreters.pypy36_prebuilt#113134
FRidh merged 2 commits intoNixOS:masterfrom
andersk:pypy_prebuilt

Conversation

@andersk
Copy link
Contributor

@andersk andersk commented Feb 14, 2021

Motivation for this change

pythonInterpreters.pypy27_prebuilt and pythonInterpreters.pypy36_prebuilt were broken by #105155 and #110591. Fix them.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@andersk
pythonInterpreters.pypy36_prebuilt: Add missing lib argument
632bc25 
This was broken by commit 001c0cb
(NixOS#110591).

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
@andersk
pythonInterpreters.pypy36_prebuilt: Set pythonOnBuildForHost
bf2b09d 
This was broken by NixOS#105155.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
@andersk andersk requested a review from FRidh as a code owner February 14, 2021 18:11
@ofborg ofborg bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Feb 14, 2021
@andersk andersk added 0.kind: regression Something that worked before working no longer 11.by: nixpkgs-member labels Feb 14, 2021
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Feb 14, 2021
@FRidh FRidh merged commit d08ec2f into NixOS:master Feb 20, 2021
@FRidh
Copy link
Member

FRidh commented Feb 20, 2021

Thanks!

@andersk andersk deleted the pypy_prebuilt branch December 26, 2022 21:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@FRidh FRidh Awaiting requested review from FRidh

Assignees

No one assigned

Labels

0.kind: regression Something that worked before working no longer 6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@andersk @FRidh