From ee9f9df6d4f41bfe7e9135a1e4b7bdd471ebc600 Mon Sep 17 00:00:00 2001 From: Collins Muriuki Date: Fri, 11 Oct 2024 13:28:53 +0300 Subject: [PATCH 1/2] optimize nix flake --- flake.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 1a535b2f7..42f5f471d 100644 --- a/flake.nix +++ b/flake.nix @@ -101,8 +101,6 @@ }; devShells.default = pkgs.mkShell { - inputsFrom = [ inputs'.holonix.devShells ]; - packages = (with inputs'.holonix.packages; [ holochain lair-keystore @@ -122,10 +120,7 @@ }; devShells.ci = pkgs.mkShell { - inputsFrom = [ self'.devShells.default ]; - packages = [ - self'.packages.hc-scaffold - ]; + packages = [ self'.packages.hc-scaffold ]; }; }; }; From 32ec78d7c1c51c4458f4504016948abcbff5864e Mon Sep 17 00:00:00 2001 From: Collins Muriuki Date: Fri, 11 Oct 2024 15:34:44 +0300 Subject: [PATCH 2/2] Supress clippy warnings --- flake.nix | 7 ++++++- src/templates/collection.rs | 2 +- src/templates/entry_type.rs | 2 +- src/templates/link_type.rs | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 42f5f471d..1a535b2f7 100644 --- a/flake.nix +++ b/flake.nix @@ -101,6 +101,8 @@ }; devShells.default = pkgs.mkShell { + inputsFrom = [ inputs'.holonix.devShells ]; + packages = (with inputs'.holonix.packages; [ holochain lair-keystore @@ -120,7 +122,10 @@ }; devShells.ci = pkgs.mkShell { - packages = [ self'.packages.hc-scaffold ]; + inputsFrom = [ self'.devShells.default ]; + packages = [ + self'.packages.hc-scaffold + ]; }; }; }; diff --git a/src/templates/collection.rs b/src/templates/collection.rs index b459e1dcc..38501fae8 100644 --- a/src/templates/collection.rs +++ b/src/templates/collection.rs @@ -28,7 +28,7 @@ pub struct ScaffoldCollectionData { } // TODO: group some params into a new-type or prefer builder pattern -#[allow(clippy::too_many_arguments)] +#[allow(unknown_lints, clippy::too_many_arguments, clippy::manual_inspect)] pub fn scaffold_collection_templates( mut app_file_tree: FileTree, template_file_tree: &FileTree, diff --git a/src/templates/entry_type.rs b/src/templates/entry_type.rs index 680855a25..0f0b78878 100644 --- a/src/templates/entry_type.rs +++ b/src/templates/entry_type.rs @@ -25,7 +25,7 @@ pub struct ScaffoldEntryTypeData<'a> { } // TODO: group some params into a new-type or prefer builder pattern -#[allow(clippy::too_many_arguments)] +#[allow(unknown_lints, clippy::too_many_arguments, clippy::manual_inspect)] pub fn scaffold_entry_type_templates( mut app_file_tree: FileTree, template_file_tree: &FileTree, diff --git a/src/templates/link_type.rs b/src/templates/link_type.rs index 1e9062bea..e5e6138eb 100644 --- a/src/templates/link_type.rs +++ b/src/templates/link_type.rs @@ -26,7 +26,7 @@ pub struct ScaffoldLinkTypeData<'a> { } // TODO: group some params into a new-type or prefer builder pattern -#[allow(clippy::too_many_arguments)] +#[allow(unknown_lints, clippy::too_many_arguments, clippy::manual_inspect)] pub fn scaffold_link_type_templates( mut app_file_tree: FileTree, template_file_tree: &FileTree,