Skip to content

lcalc: use libc++-compatible way of extending namespace std#370545

Merged
collares merged 1 commit intoNixOS:masterfrom
collares:lcalc-revert
Jan 4, 2025
Merged

lcalc: use libc++-compatible way of extending namespace std#370545
collares merged 1 commit intoNixOS:masterfrom
collares:lcalc-revert

Conversation

@collares
Copy link
Member

@collares collares commented Jan 3, 2025

I suggested something in #370176 and didn't test it properly on libc++, and it wasn't enough to fix the Sage build. Let's try an alternate fix. Another possible fix is available at #370547, along with discussion of the tradeoffs between the two.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 3, 2025
@collares collares marked this pull request as draft January 3, 2025 09:55
@collares collares changed the title lcalc: Revert workaround for vendored <complex> lcalc: use libc++-compatible way of extending namespace std Jan 4, 2025
@collares collares marked this pull request as ready for review January 4, 2025 10:45
@collares collares mentioned this pull request Jan 4, 2025
13 tasks
@nix-owners nix-owners bot requested review from 7c6f434c, omasanori and timokau January 4, 2025 10:50
Copy link
Contributor

@paparodeo paparodeo left a comment

Choose a reason for hiding this comment

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

compiled fine for me on clang-19 / darwin

@paparodeo
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 370545


x86_64-linux

✅ 5 packages built:
  • cantor
  • labplot
  • lcalc
  • sage
  • sageWithDoc

@collares collares merged commit cf071d9 into NixOS:master Jan 4, 2025
48 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants