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

archi: bugfix - added missing glib #343300

Merged
merged 1 commit into from
Oct 21, 2024
Merged

Conversation

paumr
Copy link
Contributor

@paumr paumr commented Sep 20, 2024

fixes #343272

Description of changes

This fix is required for the software to start correctly - currently the package is broken!

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@paumr paumr mentioned this pull request Sep 20, 2024
@alyssais
Copy link
Member

Commit message says glibc, but the added library is glib.

@paumr paumr changed the title archi: bugfix - added missing glibc archi: bugfix - added missing glib Sep 20, 2024
@paumr
Copy link
Contributor Author

paumr commented Sep 20, 2024

@alyssais doh, thanks for the catch! Fixed.

@ofborg ofborg bot requested a review from earldouglas September 20, 2024 18:38
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Sep 20, 2024
@r-vdp
Copy link
Contributor

r-vdp commented Oct 20, 2024

@paumr there is a merge conflict.

@paumr
Copy link
Contributor Author

paumr commented Oct 20, 2024

@r-vdp
Fixed, this happened due to a treewide refactoring ( committed last week: ccec93c ).

@r-vdp
Copy link
Contributor

r-vdp commented Oct 21, 2024

@paumr ofborg complains about darwin because the nixos test does not work on darwin. Maybe it would be better to include passthru.tests only for linux? Then it will be easier to see that the package actually builds correctly on darwin.

You can do that in a follow-up PR, I don't think we need to block this PR on that.

@r-vdp r-vdp merged commit f50dfa8 into NixOS:master Oct 21, 2024
27 of 28 checks passed
@paumr
Copy link
Contributor Author

paumr commented Oct 21, 2024

@r-vdp thanks for the merge!

The following error is logged by borg:

error: a 'x86_64-linux' with features {} is required to build '/nix/store/884s2vvfhsqhi022n58nz97arrv625hp-append-initrd-secrets.drv', but I am a 'x86_64-darwin' with features {benchmark, big-parallel, nixos-test}

To me this either seems to be an upstream issue, or a build-node one. Thus, I would not disable it on this package but hope that it will get fixed in general. Sadly I can't help with that since I neither own a mac, nor the necessary rights on borg.

@r-vdp
Copy link
Contributor

r-vdp commented Oct 21, 2024

Yeah, that's because the test doesn't build on darwin. I don't think it's useful to try and run the test on darwin, which is why I would just add it only when we're on linux. There are many other packages in nixpkgs that do this.

@paumr
Copy link
Contributor Author

paumr commented Oct 21, 2024

I see, thanks for the heads-up.
For future reference (and other readers):

@r-vdp proposed a solution similar to the one mentioned here: #345825

There were considerations on global solutions ( #294725 ), however they currently seem quite stale.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Runtime Error: archi
3 participants