From 83b22e177b48b4bd9789249bc2772f2ff33153d4 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 12 Jan 2025 19:10:28 +0300 Subject: [PATCH] fix(3p/overlays): revert harmonia back to 1.0.2 Change-Id: I2c895f91da271b61e10ea216957832a129febd20 Reviewed-on: https://cl.tvl.fyi/c/depot/+/12985 Tested-by: BuildkiteCI Reviewed-by: sterni Autosubmit: tazjin --- third_party/overlays/tvl.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 9e8b80ad6..966669f3e 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -168,4 +168,33 @@ depot.nix.readTree.drvTargets { # # temporarily restore the old name to make things work again. utillinux = self.util-linux; + + # harmonia >2.0 broke compatibility with Nix 2.3; revert back for now + harmonia = self.rustPlatform.buildRustPackage rec { + pname = "harmonia"; + version = "1.0.2"; + doCheck = false; + cargoHash = "sha256-gW/OljEngDQddIovtgwghu7uHLFVZHvWIijPgbOOkDc="; + meta.mainProgram = "harmonia"; + + src = self.fetchFromGitHub { + owner = "nix-community"; + repo = "harmonia"; + rev = "refs/tags/harmonia-v${version}"; + hash = "sha256-72nDVSvUfZsLa2HbyricOpA0Eb8gxs/VST25b6DNBpM="; + }; + + nativeBuildInputs = with self; [ + pkg-config + nixVersions.nix_2_24 + ]; + + buildInputs = with self; [ + boost + libsodium + openssl + nlohmann_json + nixVersions.nix_2_24 + ]; + }; }