diff options
author | Alex <alex@adnab.me> | 2023-03-13 15:46:48 +0000 |
---|---|---|
committer | Alex <alex@adnab.me> | 2023-03-13 15:46:48 +0000 |
commit | 7fcc153e7cfbae61626ca288634a0f4fb4c4b709 (patch) | |
tree | aa39b41d63358277d61f2cb92ef9565a97c1c901 /Cargo.nix | |
parent | dc6be3983300ee3ee10f601cfc04a06563d86f48 (diff) | |
parent | f37ec584b6009b16d1c7f06918889954b22f5afb (diff) | |
download | garage-7fcc153e7cfbae61626ca288634a0f4fb4c4b709.tar.gz garage-7fcc153e7cfbae61626ca288634a0f4fb4c4b709.zip |
Merge pull request 'rpc/system_metrics.rs: Added rustversion label to garage_build_info metric.' (#524) from jpds/garage:rustversion-label into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/524
Diffstat (limited to 'Cargo.nix')
-rw-r--r-- | Cargo.nix | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -32,7 +32,7 @@ args@{ ignoreLockHash, }: let - nixifiedLockHash = "12ff12e9210c87ac93e2f2bdb7007b6232e7efcfa302c272bf0caee6e78abd10"; + nixifiedLockHash = "d36a8590fdf6eeb128a5a852d55945b595d5830291ad0aca95a21dcc1fab8681"; workspaceSrc = if args.workspaceSrc == null then ./. else args.workspaceSrc; currentLockHash = builtins.hashFile "sha256" (workspaceSrc + /Cargo.lock); lockHashIgnored = if ignoreLockHash @@ -1861,6 +1861,9 @@ in devDependencies = { mktemp = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".mktemp."0.5.0" { inherit profileName; }).out; }; + buildDependencies = { + rustc_version = (buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".rustc_version."0.4.0" { profileName = "__noProfile"; }).out; + }; }); "unknown".garage_web."0.8.1" = overridableMkRustCrate (profileName: rec { |