Skip to content
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.

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

llvmPackages_9: remove due to age #302750

Merged
merged 1 commit into from
Apr 9, 2024
Merged

Conversation

RossComputerGuy
Copy link
Member

@RossComputerGuy RossComputerGuy commented Apr 9, 2024

Description of changes

Part of #283954

CC @wegank

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.

Follow up from #284865


Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: jupyter Interactive computing tooling: kernels, notebook, jupyterlab label Apr 9, 2024
@ghost
Copy link

ghost commented Apr 9, 2024

can remove this too:

# can remove once LLVM9 and LLVM11 are dropped from nixpkgs
+ optionalString (libcxx.isLLVM or false && lib.versionOlder (lib.getVersion libcxx) "12" && libcxx ? cxxabi.libName) ''
echo "-isystem ${lib.getDev libcxx.cxxabi}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags
echo "-l${libcxx.cxxabi.libName}" >> $out/nix-support/libcxx-ldflags
''

and should add aliases and an entry in pkgs/test/default.nix. see:
https://github.com/NixOS/nixpkgs/pull/283591/files#diff-308706790568e4d1381f5ab493c6eed2c30917e88ec06ae08d4ba9f049e8b64a

@RossComputerGuy RossComputerGuy force-pushed the feat/dump-llvm-9 branch 2 times, most recently from 6a42e34 to 765e27f Compare April 9, 2024 05:02
@RossComputerGuy
Copy link
Member Author

can remove this too:

# can remove once LLVM9 and LLVM11 are dropped from nixpkgs
+ optionalString (libcxx.isLLVM or false && lib.versionOlder (lib.getVersion libcxx) "12" && libcxx ? cxxabi.libName) ''
echo "-isystem ${lib.getDev libcxx.cxxabi}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags
echo "-l${libcxx.cxxabi.libName}" >> $out/nix-support/libcxx-ldflags
''

and should add aliases and an entry in pkgs/test/default.nix. see: https://github.com/NixOS/nixpkgs/pull/283591/files#diff-308706790568e4d1381f5ab493c6eed2c30917e88ec06ae08d4ba9f049e8b64a

Looks good now?

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

LGTM tho should verify xeus-cling builds

@RossComputerGuy
Copy link
Member Author

LGTM tho should verify xeus-cling builds

Yeah, I don't know anything about xeus-cling so someone who does know about it should look into it.

@wegank
Copy link
Member

wegank commented Apr 9, 2024

xeus-cling isn't compatible with recent versions of LLVM yet, so probably should be marked as broken. Or there's a simple fix, from jupyter-xeus/xeus-cling#513:

  postPatch = ''
    substituteInPlace src/xmagics/executable.cpp \
      --replace "getDataLayout" "getDataLayoutString"
    substituteInPlace src/xmagics/execution.cpp \
      --replace "simplisticCastAs" "castAs"
    substituteInPlace src/xmime_internal.hpp \
      --replace "code.str()" "code.str().str()"
  '';

@RossComputerGuy
Copy link
Member Author

xeus-cling isn't compatible with recent versions of LLVM yet, so probably should be marked as broken. Or there's a simple fix, from jupyter-xeus/xeus-cling#513:

  postPatch = ''
    substituteInPlace src/xmagics/executable.cpp \
      --replace "getDataLayout" "getDataLayoutString"
    substituteInPlace src/xmagics/execution.cpp \
      --replace "simplisticCastAs" "castAs"
    substituteInPlace src/xmime_internal.hpp \
      --replace "code.str()" "code.str().str()"
  '';

The patch just seems simpler.

@ghost
Copy link

ghost commented Apr 9, 2024

@ofborg build xeus-cling xeus-cling.passthru.tests

@wegank wegank merged commit 4c7d983 into NixOS:master Apr 9, 2024
22 of 24 checks passed
@ghost
Copy link

ghost commented Apr 9, 2024

woot!

@rrbutani rrbutani added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label May 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: jupyter Interactive computing tooling: kernels, notebook, jupyterlab 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 8.has: clean-up 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants