Skip to content

Comments

cling: cleanup, fix runtime error#302749

Merged
wegank merged 3 commits intoNixOS:masterfrom
wegank:cling-2
Apr 9, 2024
Merged

cling: cleanup, fix runtime error#302749
wegank merged 3 commits intoNixOS:masterfrom
wegank:cling-2

Conversation

@wegank
Copy link
Member

@wegank wegank commented Apr 9, 2024

Description of changes

Follows #284865.

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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot requested a review from thomasjm April 9, 2024 05:07
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Apr 9, 2024
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Apr 9, 2024
@wegank
Copy link
Member Author

wegank commented Apr 9, 2024

Result of nixpkgs-review pr 302749 run on aarch64-darwin 1

2 packages built:
  • cling
  • xeus-cling

Copy link
Contributor

@thomasjm thomasjm left a comment

Choose a reason for hiding this comment

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

Looks good to me, thanks for cleaning up!

I'm a little surprised that it's working with useLLVMLibcxx on Darwin. Did you try executing some code? FWIW I like to run the following as a smoke check:

#include <iostream>
std::cout << "hi" << std::endl;

@wegank
Copy link
Member Author

wegank commented Apr 9, 2024

Just ran the above on aarch64-darwin:

$ result/bin/cling

****************** CLING ******************
* Type C++ code and press enter to run it *
*             Type .q to exit             *
*******************************************
[cling]$ #include <iostream>
[cling]$ std::cout << "hi" << std::endl;
hi
[cling]$ .q

@wegank wegank merged commit 6ba9dcd into NixOS:master Apr 9, 2024
@wegank wegank deleted the cling-2 branch April 9, 2024 11:14
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: 0 This PR does not cause any packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants