From 42717e517b0761b4be2809c823050affc9fbda21 Mon Sep 17 00:00:00 2001 From: ThetaSinner Date: Thu, 18 Jul 2024 23:41:23 +0100 Subject: [PATCH] Prepare release 0.1.1 --- checked_cli/Cargo.lock | 2 +- checked_cli/Cargo.toml | 2 +- flake.nix | 18 ------------------ 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/checked_cli/Cargo.lock b/checked_cli/Cargo.lock index 5a01353..ce4ecf6 100644 --- a/checked_cli/Cargo.lock +++ b/checked_cli/Cargo.lock @@ -792,7 +792,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "checked_cli" -version = "0.1.0" +version = "0.1.1" dependencies = [ "anyhow", "checked_types", diff --git a/checked_cli/Cargo.toml b/checked_cli/Cargo.toml index 94af322..b900f5f 100644 --- a/checked_cli/Cargo.toml +++ b/checked_cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "checked_cli" -version = "0.1.0" +version = "0.1.1" edition = "2021" [[bin]] diff --git a/flake.nix b/flake.nix index 5369138..72723e9 100644 --- a/flake.nix +++ b/flake.nix @@ -45,11 +45,6 @@ , ... }: let - opensslStatic = - if system == "x86_64-darwin" - then pkgs.openssl - else pkgs.pkgsStatic.openssl; - craneLib = crane.lib.${system}; src = craneLib.cleanCargoSource (craneLib.path ./checked_cli); @@ -112,22 +107,9 @@ ]) ++ (with pkgs; [ nodejs_20 minisign - libsodium upx # For binary size optimisation. Not currently working with `checked_cli`, try again later binaryen # For wasm-opt, optimising wasms before packaging ]); - - shellHook = '' - # This is enough to get libsodium-sys-stable to link against the libsodium we're providing - export SODIUM_LIB_DIR="${pkgs.libsodium}/lib/" - export SODIUM_SHARED="1" - - # Irritatingly, the above isn't enough. Because `lair_keystore` depends on `lair_keystore_api` in its `build.rs` - # which apparently doesn't go through the same build process. That's probably enough justification that it should - # not have that dependency but for now, we get around the problem by configuring the linker directly, outside Cargo's - # build process... - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SODIUM_LIB_DIR - ''; }; }; };