From b9259b1907261b13424b45354f3ee6b068c5c1db Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 14 May 2022 16:33:03 +0800 Subject: [PATCH] update nixpkgs and LLVM --- flake.lock | 6 +++--- nix/llvm/default.nix | 4 ++-- nix/windows/default.nix | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index d8610453..cde13f73 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1650921206, - "narHash": "sha256-RGlfTC2ktqLVw0gBvZeCM//B4ig2CdQJm39sDvm0DBQ=", + "lastModified": 1652442528, + "narHash": "sha256-ctD9BdjN7e6cBipm8k9xt+vgwlRApkvuJLSNdaVrphE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a9e0f239d80fa134e8fcbdee4dfc793902da37e", + "rev": "79385ae0aacf7e02871cc8af0623123419dd7884", "type": "github" }, "original": { diff --git a/nix/llvm/default.nix b/nix/llvm/default.nix index ef1a2971..85060364 100644 --- a/nix/llvm/default.nix +++ b/nix/llvm/default.nix @@ -17,7 +17,7 @@ let inherit (lib) optional optionals optionalString; - release_version = "14.0.1"; + release_version = "14.0.3"; candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs @@ -34,7 +34,7 @@ in stdenv.mkDerivation (rec { pname = "llvm"; inherit version; - src = fetch pname "sha256-W4kBfewnKTEasUNALwPaHeptDHndXHAbyTnPizTwHsI="; + src = fetch pname "sha256-Hgnowm4bZ7yUoSi2LpucJLcMaXokNqR5yeXu3ErillQ="; unpackPhase = '' unpackFile $src diff --git a/nix/windows/default.nix b/nix/windows/default.nix index 1e3aa827..e0fff5fa 100644 --- a/nix/windows/default.nix +++ b/nix/windows/default.nix @@ -34,14 +34,14 @@ let in rec { llvm-nac3 = pkgs.stdenvNoCC.mkDerivation rec { pname = "llvm-nac3-msys2"; - version = "14.0.1"; + version = "14.0.3"; src-llvm = pkgs.fetchurl { url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/llvm-${version}.src.tar.xz"; - sha256 = "sha256-W4kBfewnKTEasUNALwPaHeptDHndXHAbyTnPizTwHsI="; + sha256 = "sha256-Hgnowm4bZ7yUoSi2LpucJLcMaXokNqR5yeXu3ErillQ="; }; src-clang = pkgs.fetchurl { url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/clang-${version}.src.tar.xz"; - sha256 = "sha256-hE+O1cVEOPxTPQoW4KrPdfhLmKWaU9CEhT0tvsL9kqE="; + sha256 = "sha256-+FxV8ZLLNbnWrx+Zi31avpDjafixZEVQP/qxsC51pvA="; }; buildInputs = [ pkgs.wineWowPackages.stable ]; phases = [ "unpackPhase" "patchPhase" "configurePhase" "buildPhase" "installPhase" ]; @@ -128,18 +128,18 @@ in rec { }; lld = pkgs.stdenvNoCC.mkDerivation rec { pname = "lld-msys2"; - version = "14.0.1"; + version = "14.0.3"; src = pkgs.fetchurl { url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/lld-${version}.src.tar.xz"; - sha256 = "sha256-MbrFSILSfJ4hfqRFA0BGrAUkLlyOSyxQ8/mAL8ijeBo="; + sha256 = "sha256-qRcW9Z+OeAGCRqerbK0b/d3sJwxNttPSo5SETuh5nI8="; }; buildInputs = [ pkgs.wineWowPackages.stable ]; phases = [ "unpackPhase" "patchPhase" "configurePhase" "buildPhase" "installPhase" ]; patches = [ ./lld-disable-macho.diff ]; setSourceRoot = # work around https://github.com/llvm/llvm-project/issues/53281 '' - mv cmake/Modules/* lld-14.0.1.src/cmake/modules - sourceRoot=lld-14.0.1.src + mv cmake/Modules/* lld-14.0.3.src/cmake/modules + sourceRoot=lld-14.0.3.src ''; configurePhase = ''