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

Add test git-dep-with-submodule #111

Closed
wants to merge 2 commits into from
Closed

Add test git-dep-with-submodule #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7635c99
Add reproduction case for lucet
Hoverbear Jun 20, 2020
d34a168
Add fix and repro
Hoverbear Jun 20, 2020
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
1 change: 1 addition & 0 deletions build.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
, fetchurl
, lndir
, userAttrs
, fetchgit
}:

let
Expand Down
3 changes: 2 additions & 1 deletion default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@
, stdenv
, writeText
, zstd
, fetchgit
}@defaultBuildAttrs:

let
libb = import ./lib.nix { inherit lib writeText runCommand remarshal; };
libb = import ./lib.nix { inherit lib writeText runCommand remarshal fetchgit; };

builtinz = builtins // import ./builtins
{ inherit lib writeText remarshal runCommand; };
Expand Down
2 changes: 1 addition & 1 deletion lib.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, writeText, runCommand, remarshal }:
{ lib, writeText, runCommand, remarshal, fetchgit }:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is fetchgit actually used?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I actually got stuck here, since fetchgit requires sha256 and as far as I can tell we don't have that! The builtins.fetchGit doesn't, but it's not due for release until Nix 2.4 (Domen told me!)

I could use your guidance or assistance. :)

let
builtinz =
builtins // import ./builtins
Expand Down
6 changes: 6 additions & 0 deletions test.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,12 @@ let
cargoOptions = (opts: opts ++ [ "--locked" ]);
};

git-dep-with-submodule = naersk.buildPackage {
doCheck = true;
src = ./test/git-dep-with-submodule;
Copy link
Member

@cole-h cole-h Jun 20, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you forgot to check in the testcase itself.

$ nix build -f test.nix git-dep-with-submodule
error: opening file '/home/vin/workspace/vcs/naersk/test/git-dep-with-submodule/Cargo.toml': No such file or directory
(use '--show-trace' to show detailed location information)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup I did! 🤦‍♀️

Good news is this new commit includes a fix!

cargoOptions = (opts: opts ++ [ "--locked" ]);
};

cargo-wildcard = naersk.buildPackage {
src = ./test/cargo-wildcard;
doCheck = true;
Expand Down
Loading