From 0eddb2d67f19ecbb18887079faeb22fff9842c2f Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Sun, 23 Apr 2023 19:13:44 -0500 Subject: [PATCH] Require full references for `pkgs.lib` Some of crane's documentation refers to `crane.lib.${system}` as just "`lib`", so removing the import from our flake reduces opportunities for confusion. --- flake.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index a6e24dc..70b41e2 100644 --- a/flake.nix +++ b/flake.nix @@ -42,7 +42,6 @@ inherit system; overlays = [ (import rust-overlay) ]; }; - inherit (pkgs) lib; craneLib = crane.lib.${system}; src = pkgs.lib.cleanSourceWith { @@ -54,7 +53,7 @@ buildInputs = with pkgs; [ ffmpeg imagemagick pandoc poppler_utils ripgrep tesseract ] - ++ lib.optionals pkgs.stdenv.isDarwin [ + ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ # Additional darwin specific inputs can be set here pkgs.libiconv ]; @@ -111,7 +110,7 @@ cargo-check.enable = true; }; }; - } // lib.optionalAttrs (system == "x86_64-linux") { + } // pkgs.lib.optionalAttrs (system == "x86_64-linux") { # NB: cargo-tarpaulin only supports x86_64 systems # Check code coverage (note: this will not upload coverage anywhere) rga-coverage =