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.

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

Revert "cln: fix build on darwin" #175027

Merged
merged 1 commit into from
May 28, 2022
Merged

Revert "cln: fix build on darwin" #175027

merged 1 commit into from
May 28, 2022

Conversation

risicle
Copy link
Contributor

@risicle risicle commented May 27, 2022

Reverts #172921

Self quoting here...

Propose we revert this because it doesn't actually fix the problem and breaks darwin x86_64. This approach produces an empty output because it can't find any Makefile because autoconf/automake hasn't been run on the source. I'm also not sure what difference pulling the source from git would make.

Interestingly, the author has made several commits to master in the last few days related to ARM assembly, so it's possible some combination of those applied as patches might help things. Could also look to see if there were a way to disable ARM assembly, because reading the commit messages it looks rather like a work in progress.

ZHF: #172160

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label May 27, 2022
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels May 27, 2022
@risicle risicle marked this pull request as ready for review May 27, 2022 23:17
@siraben siraben merged commit 94adfa2 into master May 28, 2022
@siraben siraben deleted the revert-172921-cln-fix branch May 28, 2022 00:17
@siraben
Copy link
Member

siraben commented May 28, 2022

@risicle thanks for the PR. Please remember to make the branch on your fork rather than the nixpkgs repo

@github-actions
Copy link
Contributor

Successfully created backport PR #175049 for release-22.05.

@risicle
Copy link
Contributor Author

risicle commented May 28, 2022

I think that's just because I used the "revert" button on the previous PR.

@siraben
Copy link
Member

siraben commented May 30, 2022

Hm. This breaks aarch64-darwin again, specifically transitive packages such as cvc4.

@risicle
Copy link
Contributor Author

risicle commented May 30, 2022

But that can only be because with the previous situation those reverse-dependencies were clearly happy being fed an "empty" cln. This suggests that they're actually optional dependencies and perhaps the packages should be updated to not require cln.

@risicle
Copy link
Contributor Author

risicle commented May 30, 2022

Literally, the cln package output was an empty directory for both darwin-aarch64 and darwin-x86_64

@siraben
Copy link
Member

siraben commented May 31, 2022

Right. I can confirm. Ok then the dependency should be removed since cvc4 still works without cln.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants