From 37cc0f3c08f5ae490057e05acae92b982fe8f4ca Mon Sep 17 00:00:00 2001 From: Price Hiller Date: Wed, 19 Jun 2024 02:18:26 -0500 Subject: [PATCH] fix(LakeWatchAPI): make nix flake play nice --- LakeWatchAPI/Cargo.lock | 7 +++++++ LakeWatchAPI/Cargo.toml | 3 ++- LakeWatchAPI/deny.toml | 22 ++++++++++++++++++---- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/LakeWatchAPI/Cargo.lock b/LakeWatchAPI/Cargo.lock index caedb36..77f1978 100644 --- a/LakeWatchAPI/Cargo.lock +++ b/LakeWatchAPI/Cargo.lock @@ -2109,9 +2109,16 @@ dependencies = [ "serde_json", "url", "utoipa", + "utoipa-swagger-ui-vendored", "zip", ] +[[package]] +name = "utoipa-swagger-ui-vendored" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20d6689d3a5693eec4d21f6b9d7c54f37468b856da8e98a7bb316f7b32df6e3" + [[package]] name = "utoipauto" version = "0.1.11" diff --git a/LakeWatchAPI/Cargo.toml b/LakeWatchAPI/Cargo.toml index 53495ad..6812608 100644 --- a/LakeWatchAPI/Cargo.toml +++ b/LakeWatchAPI/Cargo.toml @@ -3,6 +3,7 @@ name = "lakewatch" version = "0.1.0" edition = "2021" license = "AGPLv3" +authors = [ "Price Hiller " ] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -29,7 +30,7 @@ tracing-bunyan-formatter = "0.3.9" serde = { version = "1.0.203", features = ["derive"] } tokio = { version = "1.38.0", features = ["full"] } secrecy = { version = "0.8.0", features = ["serde"] } -utoipa-swagger-ui = { version = "7.1.0", features = ["axum"]} +utoipa-swagger-ui = { version = "7.1.0", features = ["axum", "vendored"]} utoipauto = "0.1.11" utoipa = "4.2.3" diff --git a/LakeWatchAPI/deny.toml b/LakeWatchAPI/deny.toml index 2a4b6df..c1c9d4a 100644 --- a/LakeWatchAPI/deny.toml +++ b/LakeWatchAPI/deny.toml @@ -1,6 +1,20 @@ [licenses] -allow = [ - "MIT" - "AGPL" - "GPL" +unlicensed = "deny" +allow-osi-fsf-free = "either" +copyleft = "allow" + +# ring has a rather complicated license file, and unfortunately does not +# provide an SPDX expression in the `license` toml +[[licenses.clarify]] +name = "ring" +# SPDX considers OpenSSL to encompass both the OpenSSL and SSLeay licenses +# https://spdx.org/licenses/OpenSSL.html +# ISC - Both BoringSSL and ring use this for their new files +# MIT - "Files in third_party/ have their own licenses, as described therein. The MIT +# license, for third_party/fiat, which, unlike other third_party directories, is +# compiled into non-test libraries, is included below." +# OpenSSL - Obviously +expression = "ISC AND MIT AND OpenSSL" +license-files = [ + { path = "LICENSE", hash = 0xbd0eed23 }, ]