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

openbugs: init at 3.2.3 #233506

Merged
merged 2 commits into from
May 28, 2023
Merged

openbugs: init at 3.2.3 #233506

merged 2 commits into from
May 28, 2023

Conversation

andres-nav
Copy link

@andres-nav andres-nav commented May 22, 2023

Description of changes

Uploaded a new package calles OpenBUGS and added myself as a maintainer.

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/)
  • 23.05 Release Notes (or backporting 22.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
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 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 May 22, 2023
@andres-nav andres-nav force-pushed the add/openbugs branch 2 times, most recently from de8a99f to ba61dbe Compare May 23, 2023 13:51
Copy link
Member

@nevivurn nevivurn left a comment

Choose a reason for hiding this comment

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

Thank you, lgtm!

@nevivurn
Copy link
Member

While looking at something else, I discovered stdenv_32bit:

  # A stdenv capable of building 32-bit binaries.
  # On x86_64-linux, it uses GCC compiled with multilib support; on i686-linux,
  # it's just the plain stdenv.
  stdenv_32bit = lowPrio (if stdenv.hostPlatform.is32bit then stdenv else multiStdenv);

which probably does what we want here, though I'm not sure if it's preferred.

@andres-nav
Copy link
Author

You were right, now it works for 32 bits also. I have tried it and it compiles and runs smoothly. I have just made a small tweak in the buildInputs.

Copy link
Member

@nevivurn nevivurn left a comment

Choose a reason for hiding this comment

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

Sorry, I meant that we can swap out stdenv for stdenv_32bit entirely, and omit the references to gcc_multi and nativeBuildInputs. While we're at it, we should leave a comment explaining why we have to use stdenv_32bit.

Kind of like https://github.com/nixos/nixpkgs/blob/master/pkgs/tools/misc/loadlibrary/default.nix

It still needs to be viewed by someone with commit privileges (I'm new to nixpkgs too).

@andres-nav
Copy link
Author

Yes, I understood you but I think this way it is cleaner and better as you can see de dependences explicitly.
I can modify to stdenv_32bit but I prefer this way.

Is there any other advantage using stdenv_32bit?

No problem, thank you for your work.

Copy link
Member

@nevivurn nevivurn left a comment

Choose a reason for hiding this comment

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

OK, in that case LGTM for now 👍

Copy link
Member

@alyssais alyssais left a comment

Choose a reason for hiding this comment

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

This package is really only supported on 32-bit x86, right? The gcc_multi thing is a bit of a hack. So probably it would make more sense to only support 32-bit in the package, but tell 64-bit Linux to use the 32-bit version?

(But I'm not a multilib expert, so I'm happy to be corrected by somebody who knows more about how we usually handle this stuff — I just note that we don't have any other packages directly using gcc_multi apart from LLVM, but a few packages that use pkgsi686Linux.callPackage.)

@ofborg ofborg bot added 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux and removed 10.rebuild-linux: 1 10.rebuild-linux: 1-10 labels May 28, 2023
@alyssais
Copy link
Member

@ofborg build openbugs

@alyssais
Copy link
Member

Thanks for the contribution!

@alyssais alyssais merged commit 68e7750 into NixOS:master May 28, 2023
@github-actions
Copy link
Contributor

Backport failed for release-22.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin release-22.11
git worktree add -d .worktree/backport-233506-to-release-22.11 origin/release-22.11
cd .worktree/backport-233506-to-release-22.11
git checkout -b backport-233506-to-release-22.11
ancref=$(git merge-base 05c30cbde364894fa3a774fb62e78b96b9a93f0f cfbff1faffc96af3dc4223fa12f6f4da6077decc)
git cherry-pick -x $ancref..cfbff1faffc96af3dc4223fa12f6f4da6077decc

@github-actions
Copy link
Contributor

Successfully created backport PR for release-23.05:

@alyssais
Copy link
Member

alyssais commented May 28, 2023 via email

@andres-nav
Copy link
Author

Awesome! Thank you very much.

@andres-nav andres-nav deleted the add/openbugs branch June 19, 2023 08:48
@andres-nav andres-nav mentioned this pull request Sep 12, 2023
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 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.

3 participants