Update nix pin with make nixpkgs
#4630
Closed
Conversation
This file contains hidden or 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
|
Hi @hswong3i. Thanks for your PR. I'm waiting for a cri-o member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: hswong3i The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Codecov Report
@@ Coverage Diff @@
## master #4630 +/- ##
=======================================
Coverage 43.80% 43.80%
=======================================
Files 109 109
Lines 11358 11358
=======================================
Hits 4975 4975
Misses 5909 5909
Partials 474 474 |
Member
|
Looks like systemd minimal did not build for arm: |
bb4a9eb to
0a93252
Compare
0a93252 to
0161bf2
Compare
0161bf2 to
90d29cd
Compare
8eb090d to
ac4deb3
Compare
Contributor
Author
@saschagrunert pinning with branch |
Member
Isn't it already on the 20.09 channel? |
ac4deb3 to
6c286fe
Compare
6c286fe to
0cc435c
Compare
0cc435c to
b814ea9
Compare
Contributor
Author
Original rev goes to branch New rev goes to branch |
Contributor
|
LGTM |
Contributor
|
LGTM |
Member
|
We cannot merge this one because the static build still fails: |
Contributor
Author
x86_64-linux is totally fine for my local build, where aarch64-linux support seems introduced by 4ff8662, would you mind to fix it onward? |
Member
|
We ship those arm binaries continuously, so we have to find out what in nixpkgs was breaking the build and fix it there before bumping them here. :) |
Contributor
Author
May you give a try with remove gitMinimal? Seems Perl is being triggered by that. Sorry I didn’t use aarch64-linux so couldn’t comment too much for that :-( |
Member
Can you remove the dependency from this PR? I think we fixed that git dependency issue a while ago. |
Contributor
Author
|
@saschagrunert I had tried for multiple methods:
My key founding from here are:
IMHO:
|
772d34e to
aa72a8a
Compare
Contributor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: hswong3i The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
ec8518d to
80cf89d
Compare
eaaec76 to
3daf32b
Compare
Member
|
This patch might bring us further: diff --git a/nix/default-arm64.nix b/nix/default-arm64.nix
index a75d94921..f3a427acd 100644
--- a/nix/default-arm64.nix
+++ b/nix/default-arm64.nix
@@ -30,8 +30,10 @@ let
"--enable-confdir=/etc"
"--enable-usbdropdir=/var/lib/pcsc/drivers"
"--disable-libsystemd"
+ "--disable-libudev"
+ "--disable-libusb"
];
- buildInputs = [ pkgs.python3 pkgs.udev pkgs.dbus pkgs.systemd ];
+ buildInputs = [ pkgs.python3 pkgs.dbus ];
});
systemd = (static pkg.systemd).overrideAttrs (x: {
outputs = [ "out" "dev" ]; |
3daf32b to
32a8e80
Compare
Contributor
Author
@saschagrunert much better now, dependencies build successfully, just some local error? |
Member
|
That's not good, it means that we did not build pkg-config for the correct architecture: |
45e8197 to
c6c5de4
Compare
- Bugfix `make nixpkgs` which pin with branch `nixos-21.05` - Code lint with `nixpkgs-fmt` - Code sync between x86\_64 and aarch64 Signed-off-by: Wong Hoi Sing Edison <[email protected]>
c6c5de4 to
7246ba1
Compare
Merged
Member
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
What type of PR is this?
What this PR does / why we need it:
make nixpkgswhich pin with branchnixos-21.05nixpkgs-fmtWhich issue(s) this PR fixes:
Special notes for your reviewer:
Does this PR introduce a user-facing change?