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

Merge pull request #329058 from ExpidusOS/feat/llvm-git-2024-07-21 

llvmPackages_git: 19.0.0-git-2024-07-14 -> 19.0.0-git-2024-07-21
parents 2874fc48 2deb3dd4

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

+8 −3
Original line number Diff line number Diff line
@@ -361,8 +361,7 @@ let 
            # See here for some context:

            # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132

            ++ lib.optional (

              stdenv.targetPlatform.isDarwin

              && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0"

              stdenv.targetPlatform.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0"

            ) (metadata.getVersionFile "lldb/cpu_subtype_arm64e_replacement.patch");

        }

        // lib.optionalAttrs (lib.versions.major metadata.release_version == "16") {
@@ -592,7 +591,13 @@ let 
          ./compiler-rt/armv6-no-ldrexd-strexd.patch

          ./compiler-rt/armv6-scudo-no-yield.patch

          ./compiler-rt/armv6-scudo-libatomic.patch

        ];

        ]

        ++ lib.optional (lib.versionAtLeast metadata.release_version "19") (

          fetchpatch {

            url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch";

            hash = "sha256-1CkA+RzI+645uG/QXsmOMKrLAjhVpfLUjNtgZ0QTv1E=";

          }

        );

    in

    {

      compiler-rt-libc = callPackage ./compiler-rt {

pkgs/development/compilers/llvm/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ let 
    "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";

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

    "19.0.0-git".gitRelease = {

      rev = "8da3852f44c64ac4535128741695b9e9d8ee27ef";

      rev-version = "19.0.0-unstable-2024-07-14";

      sha256 = "sha256-yGmbzueu1kkfGbQaIG+ImnpIS+RwaUl/Gx/+1w6SHRc=";

      rev = "d15ada24b1fbbd72776022383a5c557a1a056413";

      rev-version = "19.0.0-unstable-2024-07-21";

      sha256 = "sha256-ZvsHGgbcSwE0Ko8KjvRzKQLkig6VcQD7/A2XClq+kt0=";

    };

  } // llvmVersions;