notary: fix build #39684
Merged
notary: fix build #39684
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Success on x86_64-linux (full log) Attempted: notary Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: notary Partial log (click to expand)
|
|
This builds fine but your patches have a side effect: Now this isn't crucial but if it would be great if you could at least patch the version number in there somehow (users probably don't care about the git commit anyway). |
|
yeah you're absolutely right, I guess this is because |
The package is broken on master for some time now: https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.notary.x86_64-linux/all The main reason for the breackage is that the `Makefile` script attempts to retrieve the latest git commit by using `git rev-parse` which breaks as `git` is not in the build environment. This could be fixed by using `?=` rather than `:=` for the `GITCOMMIT` variable in the `make` script to easily override `GITCOMMIT` in the `buildPhase`. See the Hydra logs for reference: https://nix-cache.s3.amazonaws.com/log/ib4qp8h4r8d830ra4fah38l7ybb82gp7-notary-0.6.0.drv Furthermore some refactoring was applied: * Activated the test suite for `cmd/notary` to confirm the basic functionality when building for NixOS. * Added {pre,post} hooks for `{build,install}Phase` * Added myself as maintainer to have more people available in case of further breakage.
|
@xeji thanks for your feedback - I fixed the problem! |
|
Success on x86_64-linux (full log) Attempted: notary Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: notary Partial log (click to expand)
|
|
Great, thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
The package is broken on master for some time now:
https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.notary.x86_64-linux/all
The main reason for the breackage is that the
Makefilescript attemptsto retrieve the latest git commit by using
git rev-parsewhich breaksas
gitis not in the build environment. This could be fixed by using?=rather than:=for theGITCOMMITvariable in themakescriptto easily override
GITCOMMITin thebuildPhase.See the Hydra logs for reference:
https://nix-cache.s3.amazonaws.com/log/ib4qp8h4r8d830ra4fah38l7ybb82gp7-notary-0.6.0.drv
Furthermore some refactoring was applied:
Activated the test suite for
cmd/notaryto confirm the basicfunctionality when building for NixOS.
Added {pre,post} hooks for
{build,install}PhaseAdded myself as maintainer to have more people available in case of
further breakage.
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)