Updated flake.nix to work with recent nixpkgs, GCC 15 and 16 and Clang 20, 21 and 22 - #28
Open
AntoninHorkel wants to merge 1 commit into
Conversation
…g 20, 21 and 22
- Fixed include in compiler-plugins/SoftwareCountersClangPlugin/SoftwareCounters.cpp for LLVM 22
- Updated README in SoftwareCountersClangPlugin and SoftwareCountersGccPlugin to list Clang 21/22 and GCC 16 as supported
- In flake.nix:
- Updated inputs
- Fixed rr_compiled_with for recent nixpkgs by removing a patch which was already applied in commit 6251648 and adding -DCMAKE_CXX_STANDARD=20 CMake flag required by rocksdb 10.10.1
- Replaced pkgs.clang18Stdenv and pkgs.clang19Stdenv with pkgs.llvmPackages_18.stdenv and pkgs.llvmPackages_19.stdenv respectively, the pkgs.clang<version>Stdenv don't exist for newer Clang versions and pkgs.llvmPackages_<version>.stdenv should be used instead
- Fixed packages rr-builtwithgcc and rr-builtwithclang by adding an override for gccMultiStdenv as pkgs.rr now insists on using gccMultiStdenv on x86_64, ignoring plain stdenv override
- Added rr-builtwithgcc<GCC version> and rr-builtwithclang<Clang version> packages
- Cleaned-up and formatted flake.nix
AntoninHorkel
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
rr_compiled_withfor recent nixpkgs by removing a patch which was already applied in commit 6251648 and adding -DCMAKE_CXX_STANDARD=20CMake flag required bypkgs.rocksdb10.10.1pkgs.clang18Stdenvandpkgs.clang19Stdenvwithpkgs.llvmPackages_18.stdenvandpkgs.llvmPackages_19.stdenvrespectively, thepkgs.clang<version>Stdenvdon't exist for newer Clang versions andpkgs.llvmPackages_<version>.stdenvshould be used insteadgccMultiStdenvaspkgs.rrnow insists on usinggccMultiStdenvon x86_64, ignoring plainstdenvoverriderr-builtwithgcc<GCC version>andrr-builtwithclang<Clang version>packages