Skip to content

kallisto: fix build with gcc 15#522275

Merged
mdaniels5757 merged 1 commit into
NixOS:masterfrom
MiniHarinn:fix/kallisto
May 23, 2026
Merged

kallisto: fix build with gcc 15#522275
mdaniels5757 merged 1 commit into
NixOS:masterfrom
MiniHarinn:fix/kallisto

Conversation

@MiniHarinn

@MiniHarinn MiniHarinn commented May 20, 2026

Copy link
Copy Markdown
Contributor

Vendor the patch from pmelsted/bifrost#18
ZHF: #516381 (Part of)

Hydra Failure (Click the banner to go to Hydra build report):

Things done

@MiniHarinn MiniHarinn added the 0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign label May 20, 2026
@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels May 20, 2026
@MiniHarinn

Copy link
Copy Markdown
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 522275
Commit: 6f380a6d96f437fa07687ca50ac9aa7ec294dd2a (subsequent changes)
Merge: 35f64fd02d9875a4691f3d12be4a21de16c0ef0b

Logs: https://github.com/MiniHarinn/nixpkgs-review-gha/actions/runs/26172139056


x86_64-linux

✅ 1 package built:
  • kallisto

aarch64-linux

✅ 1 package built:
  • kallisto

x86_64-darwin

No rebuilds


aarch64-darwin

No rebuilds

@MiniHarinn MiniHarinn marked this pull request as ready for review May 20, 2026 15:40
@nixpkgs-ci nixpkgs-ci Bot requested a review from arcadio May 20, 2026 15:55

@arcadio arcadio left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for your patch. I would prefer to point to upstream instead of a third party (FreeBSD). This seems to work on current unstable:

# Fix typo in vendored bifrost DataStorage<U> copy constructor exposed by gcc 15.
# https://github.com/pmelsted/bifrost/pull/18
patches = [(fetchpatch2 {
    name = "bifrost-fix-datastorage-sz_link-typo.patch";
    url = "https://github.com/pmelsted/bifrost/pull/18.patch";
    hash = "sha256-FX9VKEkzfPAEmYWoMs189qSL4rM6/pCF4QR82zp/eWU=";
    stripLen = 1;
    extraPrefix = "ext/bifrost/";
})];

@MiniHarinn

Copy link
Copy Markdown
Contributor Author

That would be nice if it were merged upstream (but it's still open). Per the documentation, the URL of the PR plus .patch is unstable url (it can change in case of a force-push, etc.), so I opted for using FreeBSD's patch instead. If you still want to point to upstream, I can vendor that .patch and use it instead. Sounds good?

@arcadio

arcadio commented May 21, 2026

Copy link
Copy Markdown
Member

Sure, committing the patch is the best option. The pull request URL would also work well as a stopgap. Hash mismatches would warn us about any pull request changes. It's simpler but a bit less reproducible. I'll discuss merging it upstream, but this will take time.

@arcadio arcadio self-requested a review May 22, 2026 19:05
@arcadio

arcadio commented May 22, 2026

Copy link
Copy Markdown
Member

Approved, many thanks for your PR.

@nixpkgs-ci nixpkgs-ci Bot added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels May 22, 2026
@mdaniels5757 mdaniels5757 added this pull request to the merge queue May 23, 2026
Merged via the queue into NixOS:master with commit 7d1048d May 23, 2026
30 checks passed
@MiniHarinn MiniHarinn deleted the fix/kallisto branch May 23, 2026 05:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants