Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

consider additionalCargoLock for git dependencies #332

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

consider additionalCargoLock for git dependencies #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ let
let
config = mkConfig arg;
gitDependencies =
libb.findGitDependencies { inherit (config) cargolock gitAllRefs gitSubmodules; };
libb.findGitDependencies { inherit (config) cargolock additionalcargolock gitAllRefs gitSubmodules; };
cargoconfig =
if builtinz.pathExists (toString config.root + "/.cargo/config")
then (config.root + "/.cargo/config")
Expand Down
6 changes: 3 additions & 3 deletions lib.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ rec
# }
# ]
findGitDependencies =
{ cargolock, gitAllRefs, gitSubmodules }:
{ cargolock, additionalcargolock, gitAllRefs, gitSubmodules }:
let
query = p: (lib.substring 0 4 (p.source or "")) == "git+";

Expand Down Expand Up @@ -101,10 +101,10 @@ rec
// (lib.optionalAttrs (! isNull rev) { inherit rev; });

usedPackageLocks =
builtins.map parseLock (lib.filter query cargolock.package);
builtins.map parseLock ((lib.filter query cargolock.package) ++ (lib.optionals (! isNull additionalcargolock) (lib.filter query additionalcargolock.package)));

unusedPackageLocks =
builtins.map parseLock (lib.filter query ((cargolock.patch or []).unused or []));
builtins.map parseLock (lib.filter query ((cargolock.patch or [ ]).unused or [ ])) ++ (lib.optionals (! isNull additionalcargolock) (lib.filter query ((additionalcargolock.patch or [ ]).unused or [ ])));

packageLocks = usedPackageLocks ++ unusedPackageLocks;

Expand Down