Unverified Commit a9cb9aca authored by Tristan Ross's avatar Tristan Ross Committed by GitHub
Browse files

Merge pull request #336228 from ExpidusOS/feat/llvm-19-rc3 

llvmPackages_19: 19.1.0-rc2 -> 19.1.0-rc3
parents aecefeaa 7e623c1a

pkgs/development/compilers/llvm/common/default.nix

+4 −3
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ let 
              "openmp/fix-find-tool.patch" = [

                {

                  after = "17";

                  before = "19";

                  path = ../17;

                }

              ];
@@ -1059,9 +1060,9 @@ let 


      openmp = callPackage ./openmp {

        patches =

          lib.optional (lib.versionAtLeast metadata.release_version "15") (

            metadata.getVersionFile "openmp/fix-find-tool.patch"

          )

          lib.optional (

            lib.versionAtLeast metadata.release_version "15" && lib.versionOlder metadata.release_version "19"

          ) (metadata.getVersionFile "openmp/fix-find-tool.patch")

          ++ lib.optional (

            lib.versionAtLeast metadata.release_version "14" && lib.versionOlder metadata.release_version "18"

          ) (metadata.getVersionFile "openmp/gnu-install-dirs.patch")

pkgs/development/compilers/llvm/common/lldb.nix

+5 −2
Original line number Diff line number Diff line
@@ -30,11 +30,14 @@ 
let

  src' =

    if monorepoSrc != null then

      runCommand "lldb-src-${version}" { } ''

      runCommand "lldb-src-${version}" { } (''

        mkdir -p "$out"

        cp -r ${monorepoSrc}/cmake "$out"

        cp -r ${monorepoSrc}/lldb "$out"

      '' else src;

      '' + lib.optionalString (lib.versionAtLeast release_version "19" && enableManpages) ''

        mkdir -p "$out/llvm"

        cp -r ${monorepoSrc}/llvm/docs "$out/llvm/docs"

      '') else src;

  vscodeExt = {

    name = if lib.versionAtLeast release_version "18" then "lldb-dap" else "lldb-vscode";

    version = if lib.versionAtLeast release_version "18" then "0.2.0" else "0.1.0";

pkgs/development/compilers/llvm/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ let 
    "16.0.6".officialRelease.sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs=";

    "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";

    "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";

    "19.1.0-rc2".officialRelease.sha256 = "sha256-/WiT3Tp5HsmfOgscvFF4NLHx4tqYroSUC335sm49vs8=";

    "19.1.0-rc3".officialRelease.sha256 = "sha256-SRonSpXt1pH6Xk+rQZk9mrfMdvYIvOImwUfMUu3sBgs=";

    "20.0.0-git".gitRelease = {

      rev = "4f5d866af7fed0de1671a68530d3023e9762b71e";

      rev-version = "20.0.0-unstable-2024-08-13";