Skip to content

Update nixpkgs and other flake dependencies#425

Merged
danieldk merged 12 commits intomainfrom
bump-nixpkgs-20260331
Apr 2, 2026
Merged

Update nixpkgs and other flake dependencies#425
danieldk merged 12 commits intomainfrom
bump-nixpkgs-20260331

Conversation

@danieldk
Copy link
Copy Markdown
Member

@danieldk danieldk commented Apr 2, 2026

No description provided.

danieldk added 12 commits April 1, 2026 07:20
Before this change we erroneously inherited `callPackage` from nixpkgs.
This `callPackage` does not have access to the new scope (the ROCm/XPU
package set). However, this error was masked by `makeScope` overriding
`callPackage`, so `final` had the correct version. The latest nixpkgs
supports overriding `callPackage`, which surfaced this bug.
This check takes a long time, sometimes times out, and is already
checked upstream.
`dlopen` by the Python interpreter failed with:

cannot enable executable stack as shared object requires: Invalid argument

Pass the `-z noexecstack` to the linker to mark the library as not
requiring an executable stack.

in
buildPythonPackage {
buildPythonPackage.override { stdenv = effectiveStdenv; } {
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using stdenv in the attrset passed to buildPythonPackage is now deprecated in nixpkgs.

}

if [ -z "${dontCheckRuntimeDeps-}" ]; then
if [ -z "${dontCheckWheelDeps-}" ]; then
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Forgot to rename this when adding this hook to our repo, but the name now clashes with the same variable in the original hook in nixpkgs.

Comment on lines +12 to +17
inherit (lib.fixedPoints) extends composeManyExtensions;

fixedPoint = final: {
inherit lib packageMetadata;
};
composed = composeManyExtensions [
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Collaborator

@drbh drbh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

@danieldk danieldk merged commit 8ed7bb4 into main Apr 2, 2026
38 checks passed
@danieldk danieldk deleted the bump-nixpkgs-20260331 branch April 2, 2026 15:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants