From 6d10308c8cfc8d9b4d9597bbe3f96489503b3887 Mon Sep 17 00:00:00 2001 From: Callum Dunster Date: Wed, 4 Sep 2024 16:47:15 +0200 Subject: [PATCH 1/4] chore: add support for direnv to use nix flake devShell --- .envrc | 1 + 1 file changed, 1 insertion(+) create mode 100644 .envrc diff --git a/.envrc b/.envrc new file mode 100644 index 00000000..3550a30f --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake From 86fe6b3007007c33a12fdbc2f98af4d720d6fa8a Mon Sep 17 00:00:00 2001 From: Callum Dunster Date: Wed, 4 Sep 2024 16:48:17 +0200 Subject: [PATCH 2/4] docs: fix typo in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c098f687..3a9fa971 100644 --- a/README.md +++ b/README.md @@ -132,7 +132,7 @@ behaviour by different agents. > Writing scenarios requires some knowledge of `wind-tunnel`'s methodology. That is assumed knowledge for this section! Writing a Wind Tunnel scenario is relatively straight forward. The complexity is mostly in the measurement and analysis of the system -once the scenario is running. To begin, you need a Rust project that with a single binary target. +once the scenario is running. To begin, you need a Rust project with a single binary target. `cargo new --bin --edition 2021 my_scenario` From b071db2351abfd4e3ec80d6d369ceb9e3c31ed2c Mon Sep 17 00:00:00 2001 From: Callum Dunster Date: Wed, 4 Sep 2024 16:51:21 +0200 Subject: [PATCH 3/4] fix: openssl dependency on NixOS systems Set the env variable `OPENSSL_NO_VENDOR` to `1` which forces the `openssl-sys` crate to use `pkg-config` to find the local version of openssl. --- flake.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/flake.nix b/flake.nix index aaa446be..9436ef6b 100644 --- a/flake.nix +++ b/flake.nix @@ -75,6 +75,8 @@ pkgs.httpie pkgs.shellcheck pkgs.statix + pkgs.pkg-config + pkgs.openssl inputs'.holonix.packages.holochain inputs'.holonix.packages.lair-keystore inputs'.holonix.packages.hn-introspect @@ -87,6 +89,8 @@ pkgs.darwin.apple_sdk.frameworks.CoreFoundation ]; + OPENSSL_NO_VENDOR = 1; + shellHook = '' source ./scripts/influx.sh source ./scripts/telegraf.sh From 7de5031780b41f095a86d77f01473908ee142fc6 Mon Sep 17 00:00:00 2001 From: Callum Dunster Date: Thu, 5 Sep 2024 14:28:08 +0200 Subject: [PATCH 4/4] amend! fix: openssl dependency on NixOS systems fix: add perl package as required by openssl The `openssl-sys` crate is building openssl from source and statically linking it, building openssl from source requires perl. --- flake.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 9436ef6b..d0d79503 100644 --- a/flake.nix +++ b/flake.nix @@ -75,8 +75,7 @@ pkgs.httpie pkgs.shellcheck pkgs.statix - pkgs.pkg-config - pkgs.openssl + pkgs.perl inputs'.holonix.packages.holochain inputs'.holonix.packages.lair-keystore inputs'.holonix.packages.hn-introspect @@ -89,8 +88,6 @@ pkgs.darwin.apple_sdk.frameworks.CoreFoundation ]; - OPENSSL_NO_VENDOR = 1; - shellHook = '' source ./scripts/influx.sh source ./scripts/telegraf.sh