From ea7aa01e1e2d89fb00c758943b135dc56cd7c1fc Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Tue, 10 Sep 2024 12:24:24 +0100 Subject: build: fix dependancy package errors which were preventing the build process from running --- Cargo.lock | 39 +-------------------------------------- Cargo.toml | 1 - flake.nix | 4 ++++ 3 files changed, 5 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7dcf4a0..a3c6574 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1656,15 +1656,6 @@ version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.7.1" @@ -1777,7 +1768,6 @@ dependencies = [ "nostr-sqlite", "once_cell", "passwords", - "rexpect 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "scrypt", "serde", "serde_json", @@ -1789,20 +1779,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "nix" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.6.5", - "pin-utils", -] - [[package]] name = "nix" version = "0.26.4" @@ -2533,19 +2509,6 @@ dependencies = [ "winreg", ] -[[package]] -name = "rexpect" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ff60778f96fb5a48adbe421d21bf6578ed58c0872d712e7e08593c195adff8" -dependencies = [ - "comma", - "nix 0.25.1", - "regex", - "tempfile", - "thiserror", -] - [[package]] name = "rexpect" version = "0.5.0" @@ -3070,7 +3033,7 @@ dependencies = [ "nostr-sqlite", "once_cell", "rand", - "rexpect 0.5.0 (git+https://github.com/rust-cli/rexpect.git?rev=9eb61dd)", + "rexpect", "simple-websockets", "strip-ansi-escapes", "tokio", diff --git a/Cargo.toml b/Cargo.toml index 1059f96..4d5b7d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,7 +43,6 @@ assert_cmd = "2.0.12" duplicate = "1.0.0" mockall = "0.11.4" once_cell = "1.18.0" -rexpect = "0.5.0" serial_test = "2.0.0" test_utils = { path = "test_utils" } diff --git a/flake.nix b/flake.nix index 5015dba..d84d745 100644 --- a/flake.nix +++ b/flake.nix @@ -52,6 +52,10 @@ src = bin.path; cargoLock = { lockFile = ./Cargo.lock; + outputHashes = { + "rexpect-0.5.0" = "0amxyp81r90gfqlx5dnfjsmd403kf5hcw0crzpcmsbaviavxff4y"; + "simple-websockets-0.1.6" = "0910bbl7p3by18w3wks8gbgdg8879hn2c39z1bkr5pcvfkcxmaf3"; + }; }; buildInputs = [ pkgs.pkg-config -- cgit v1.2.3