Skip to content

Adjust for renaming of pythonForBuild to pythonOnBuildForHost #1521

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

Merged
cpcloud merged 1 commit into from
Feb 4, 2024
Merged

Adjust for renaming of pythonForBuild to pythonOnBuildForHost #1521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions hooks/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ python, stdenv, makeSetupHook, pkgs, lib }:
let
inherit (python) pythonForBuild;
inherit (pythonForBuild.pkgs) callPackage;
pythonInterpreter = pythonForBuild.interpreter;
pythonOnBuildForHost = python.pythonOnBuildForHost or python.pythonForBuild;
inherit (pythonOnBuildForHost.pkgs) callPackage;
pythonInterpreter = pythonOnBuildForHost.interpreter;
pythonSitePackages = python.sitePackages;

nonOverlayedPython = pkgs.python3.pythonForBuild.withPackages (ps: [ ps.tomlkit ]);
nonOverlayedPython = (pkgs.python3.pythonOnBuildForHost or pkgs.python3.pythonForBuild).withPackages (ps: [ ps.tomlkit ]);
makeRemoveSpecialDependenciesHook =
{ fields
, kind
Expand Down
8 changes: 4 additions & 4 deletions overrides/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ let
true;
intendedBuildSystem =
if attr.buildSystem == "cython" then
self.python.pythonForBuild.pkgs.cython
(self.python.pythonOnBuildForHost or self.python.pythonForBuild).pkgs.cython
else
self.${attr.buildSystem};
in
if fromIsValid && untilIsValid then intendedBuildSystem else null
else
if attr == "cython" then self.python.pythonForBuild.pkgs.cython else self.${attr};
if attr == "cython" then (self.python.pythonOnBuildForHost or self.python.pythonForBuild).pkgs.cython else self.${attr};
in
if (attr == "flit-core" || attr == "flit" || attr == "hatchling") && !self.isPy3k then drv
else if drv == null then null
Expand Down Expand Up @@ -101,7 +101,7 @@ lib.composeManyExtensions [
let
inherit (self.python) stdenv;
inherit (pkgs.buildPackages) pkg-config;
pyBuildPackages = self.python.pythonForBuild.pkgs;
pyBuildPackages = (self.python.pythonOnBuildForHost or self.python.pythonForBuild).pkgs;

selectQt5 = version:
let
Expand Down Expand Up @@ -129,7 +129,7 @@ lib.composeManyExtensions [
qtxmlpatterns
];

bootstrappingBase = pkgs.${self.python.pythonAttr}.pythonForBuild.pkgs;
bootstrappingBase = (pkgs.${self.python.pythonAttr}.pythonOnBuildForHost or pkgs.${self.python.pythonAttr}.pythonForBuild).pkgs;
in

{
Expand Down