Skip to content

all-packages.nix: pythonXPackages point to pythonXXPackages#165994

Merged
Artturin merged 1 commit intoNixOS:masterfrom
Artturin:testofborgthingy
Mar 28, 2022
Merged

all-packages.nix: pythonXPackages point to pythonXXPackages#165994
Artturin merged 1 commit intoNixOS:masterfrom
Artturin:testofborgthingy

Conversation

@Artturin
Copy link
Member

@Artturin Artturin commented Mar 27, 2022

instead of pythonXX.pkgs

should help with ofborg not building
commits which have python3Packages instead of
python39Packages
see NixOS/ofborg#577

dontRecurseIntoAttrs is used to avoid a performance penalty

@SuperSandro2000 you'll probably be interested in this

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/)
  • 22.05 Release Notes (or backporting 21.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.

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Mar 27, 2022
@Artturin
Copy link
Member Author

looks like it used to be pythonXPackages but was switched to python3.pkgs in 66f7398

@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Mar 27, 2022
@Artturin
Copy link
Member Author

it shows that this will have many rebuilds, however this will have 0 rebuilds

it can be confirmed with

nix eval ".#python3Packages.aadict.drvPath" && git apply - <<< $(curl -s https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/165994.patch) && nix eval ".#python3Packages.aadict.drvPath"

@Artturin Artturin requested a review from FRidh March 27, 2022 20:02
@mweinelt
Copy link
Member

mweinelt commented Mar 27, 2022

Can you fix up the commit message? The first line looks messy and probably shouldn't repeat the diff but instead describe the change. Something along the lines of reference canonical python package set names earlier

@mweinelt
Copy link
Member

Will not recursing into these attrsets still mean they will be built by hydra?

@Artturin
Copy link
Member Author

Will not recursing into these attrsets still mean they will be built by hydra?

python39Packages is recursed in to later

  python39Packages = recurseIntoAttrs python39.pkgs;
  python310Packages = recurseIntoAttrs python310.pkgs;

@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. and removed 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Mar 27, 2022
instead of pythonXX.pkgs

should help with ofborg not building
commits which have `python3Packages` instead of
`python39Packages`
see NixOS/ofborg#577

dontRecurseIntoAttrs is used to avoid a performance penalty
@Artturin Artturin changed the title all-packages.nix: python3Packages = python3.pkgs -> python3Packages =… all-packages.nix: pythonXPackages point to pythonXXPackages Mar 28, 2022
@Artturin Artturin merged commit 38021f6 into NixOS:master Mar 28, 2022
@Artturin Artturin deleted the testofborgthingy branch March 28, 2022 02:21
@SuperSandro2000
Copy link
Member

This should be active immediately? Lets see if it works. Sticking to python310Packages for now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: package (new) This PR adds a new package 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

Development

Successfully merging this pull request may close these issues.

3 participants