cleanup
Some checks are pending
CI / checks (push) Waiting to run

This commit is contained in:
Robin Appelman 2024-12-23 22:55:58 +01:00
commit 9f851855a9
2 changed files with 4 additions and 4 deletions

View file

@ -4,7 +4,7 @@
stdenv, stdenv,
lib, lib,
}: let }: let
inherit (lib) mapAttrs hasInfix replaceStrings toUpper concatStrings recursiveUpdate; inherit (lib) hasInfix replaceStrings toUpper concatStrings;
isMusl = hasInfix "-musl"; isMusl = hasInfix "-musl";
crossOpts = callPackage ./crossOpts.nix {}; crossOpts = callPackage ./crossOpts.nix {};

View file

@ -9,8 +9,8 @@
inputs, inputs,
... ...
}: let }: let
inherit (builtins) elem readFile pathExists isAttrs match any; inherit (builtins) elem readFile pathExists match any;
inherit (lib) getExe map mkDefault mkIf mkMerge mkOption warnIf assertMsg optionalAttrs types optionalString genAttrs hasInfix intersectLists attrVals; inherit (lib) getExe map mkDefault mkIf mkMerge mkOption warnIf optionalAttrs types optionalString genAttrs hasInfix;
inherit (lib.fileset) fileFilter toSource unions; inherit (lib.fileset) fileFilter toSource unions;
inherit (flakelight.types) fileset function optFunctionTo; inherit (flakelight.types) fileset function optFunctionTo;
@ -21,7 +21,7 @@
cargoToml = fromTOML (readFile (src + /Cargo.toml)); cargoToml = fromTOML (readFile (src + /Cargo.toml));
cargoMeta = (import ./cargo-meta.nix {inherit lib;}) cargoToml; cargoMeta = (import ./cargo-meta.nix {inherit lib;}) cargoToml;
inherit (cargoMeta) tomlPackage hasMsrv hasWorkspace hasFeatures hasNonDefaultFeatures hasDefaultFeatures msrv; inherit (cargoMeta) tomlPackage hasMsrv hasWorkspace hasNonDefaultFeatures hasDefaultFeatures msrv;
maybeWorkspace = optionalString hasWorkspace "--workspace"; maybeWorkspace = optionalString hasWorkspace "--workspace";
hasExamples = pathExists (src + /examples); hasExamples = pathExists (src + /examples);