From 4c39dd240f7975b5d03f6b5ec43750494ff22250 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Tue, 31 May 2022 23:09:51 +0800 Subject: [PATCH] update all dependencies --- Cargo.lock | 16 ++++++++-------- flake.lock | 8 ++++---- flake.nix | 2 +- nix/llvm/default.nix | 4 ++-- nix/windows/default.nix | 14 +++++++------- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 805c4d833..bcae7ae4d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -278,9 +278,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.7.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a" dependencies = [ "autocfg", "hashbrown", @@ -325,7 +325,7 @@ dependencies = [ "libc", "llvm-sys", "once_cell", - "parking_lot 0.12.0", + "parking_lot 0.12.1", ] [[package]] @@ -582,9 +582,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", "parking_lot_core 0.9.3", @@ -638,9 +638,9 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b305cc4569dd4e8765bab46261f67ef5d4d11a4b6e745100ee5dad8948b46c" +checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" dependencies = [ "fixedbitset", "indexmap", @@ -1000,7 +1000,7 @@ checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" dependencies = [ "new_debug_unreachable", "once_cell", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "phf_shared 0.10.0", "precomputed-hash", ] diff --git a/flake.lock b/flake.lock index 771e487fd..bf6dda167 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1653354321, - "narHash": "sha256-AMUhX1Ch0KMDWCze6KAntwlJ1iFp0fLK2TTW9Mj85WY=", + "lastModified": 1653920503, + "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b80531b35cbcddcaf74ceb685b3a0847c134cbe1", + "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-22.05", + "ref": "nixos-22.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 813d7ea5e..064bc251a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "The third-generation ARTIQ compiler"; - inputs.nixpkgs.url = github:NixOS/nixpkgs/release-22.05; + inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-22.05; outputs = { self, nixpkgs }: let diff --git a/nix/llvm/default.nix b/nix/llvm/default.nix index 850603648..1ad492a02 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.3"; + release_version = "14.0.4"; 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-Hgnowm4bZ7yUoSi2LpucJLcMaXokNqR5yeXu3ErillQ="; + src = fetch pname "sha256-646Q362uQHOn+PxjhLrMDdoHJADYK50l2rtSgKc3uiI="; unpackPhase = '' unpackFile $src diff --git a/nix/windows/default.nix b/nix/windows/default.nix index d5da34b85..f52825fdb 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.3"; + version = "14.0.4"; src-llvm = pkgs.fetchurl { url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/llvm-${version}.src.tar.xz"; - sha256 = "sha256-Hgnowm4bZ7yUoSi2LpucJLcMaXokNqR5yeXu3ErillQ="; + sha256 = "sha256-646Q362uQHOn+PxjhLrMDdoHJADYK50l2rtSgKc3uiI="; }; src-clang = pkgs.fetchurl { url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/clang-${version}.src.tar.xz"; - sha256 = "sha256-+FxV8ZLLNbnWrx+Zi31avpDjafixZEVQP/qxsC51pvA="; + sha256 = "sha256-kivcg0FJHU9UVIxRuv13wOc3oxRv4zx2K84xoP0VFZE="; }; 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.3"; + version = "14.0.4"; src = pkgs.fetchurl { url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/lld-${version}.src.tar.xz"; - sha256 = "sha256-qRcW9Z+OeAGCRqerbK0b/d3sJwxNttPSo5SETuh5nI8="; + sha256 = "sha256-BeEoSmUWbQo6ETm5mT8cYyuCkwUBMWriDIiiBBcMK6Y="; }; 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.3.src/cmake/modules - sourceRoot=lld-14.0.3.src + mv cmake/Modules/* lld-14.0.4.src/cmake/modules + sourceRoot=lld-14.0.4.src ''; configurePhase = ''