Skip to content

Determine if the tag is a ref or a rev #1665

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

Merged
merged 6 commits into from
Sep 15, 2022
Merged

Determine if the tag is a ref or a rev #1665

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8bbf7dc
Determine if the tag is a ref or a rev
parsonsmatt Sep 13, 2022
1900bdc
ok
parsonsmatt Sep 13, 2022
20016a7
ok
parsonsmatt Sep 13, 2022
f556b12
lmao
parsonsmatt Sep 13, 2022
bbdd2a0
Address comments
parsonsmatt Sep 14, 2022
0e868ed
better if not present
parsonsmatt Sep 14, 2022
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
10 changes: 8 additions & 2 deletions lib/cabal-project-parser.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,15 @@ let
# --shar256: 003lm3pm0000hbfmii7xcdd9v20000flxf7gdl2pyxia7p014i8z
# will be trated like a field and returned here
# (used in call-cabal-project-to-nix.nix to create a fixed-output derivation)
extractSourceRepoPackageData = cabalProjectFileName: sha256map: repo: {
extractSourceRepoPackageData = cabalProjectFileName: sha256map: repo:
let
refOrRev =
if builtins.match "[0-9a-f](40)" repo.tag != null
then "rev"
else "ref";
in {
url = repo.location;
ref = repo.tag;
"${refOrRev}" = repo.tag;
sha256 = repo."--sha256" or (
if sha256map != null
then sha256map."${repo.location}"."${repo.tag}"
Expand Down
4 changes: 2 additions & 2 deletions lib/call-cabal-project-to-nix.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,9 @@ let
then throw "${inputMap.${repoData.url}.rev} may not match ${repoData.ref} for ${repoData.url} use \"${repoData.url}/${repoData.ref}\" as the inputMap key if ${repoData.ref} is a branch or tag that points to ${inputMap.${repoData.url}.rev}."
else inputMap.${repoData.url})
else if repoData.sha256 != null
then fetchgit { inherit (repoData) url sha256; rev = repoData.ref; }
then fetchgit { inherit (repoData) url sha256 rev; }
Copy link
Collaborator

Choose a reason for hiding this comment

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

What happens here if we have a repoData.ref but no repoData.rev?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good question!

Looks like fetchgit's rev attribute can either be a commit or a ref-like attribute, so I should do rev = repoData.rev or repoData.ref instead of inheriting.

else
let drv = builtins.fetchGit { inherit (repoData) url ref; };
let drv = builtins.fetchGit { inherit (repoData) url ; rev = repoData.rev or repoData.ref; ref = repoData.ref or null; };
in __trace "WARNING: No sha256 found for source-repository-package ${repoData.url} ${repoData.ref} download may fail in restricted mode (hydra)"
Copy link
Collaborator

Choose a reason for hiding this comment

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

This __trace that uses ${repoData.ref}, is that still safe? Should it use ${repoData.rev or repoData.ref}?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch. I think a complication is that we may have a ref and a rev (which is part of what this is intending to allow). ie, I was trying to fetch a repo with no master, so it didn't fetch the right branch because ref was specified to be something else.

I'll update the trace message to include both.

(__trace "Consider adding `--sha256: ${hashPath drv}` to the ${cabalProjectFileName} file or passing in a sha256map argument"
drv);
Expand Down