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

openbsd: many new small packages #371699

Merged
merged 34 commits into from
Jan 17, 2025
Merged

openbsd: many new small packages #371699

merged 34 commits into from
Jan 17, 2025

Conversation

rhelmot
Copy link
Contributor

@rhelmot rhelmot commented Jan 7, 2025

All of these packages are necessary for an OpenBSD system to boot.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
    • x86_64-openbsd
  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@github-actions github-actions bot added 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 labels Jan 7, 2025
@rhelmot rhelmot added the 6.topic: bsd Running or building packages on BSD label Jan 8, 2025
@pbsds
Copy link
Member

pbsds commented Jan 15, 2025

is it possible to test this via cross?

@rhelmot
Copy link
Contributor Author

rhelmot commented Jan 15, 2025

Yes, they have only been tested cross so far; we don't have openbsd native building yet.

@pbsds
Copy link
Member

pbsds commented Jan 15, 2025

I compiled a list to build from the git commit titles and got this

$ nix-build . \
    -A pkgsCross.x86_64-openbsd.openbsd.cap_mkdb \
    -A pkgsCross.x86_64-openbsd.openbsd.cmp \
    -A pkgsCross.x86_64-openbsd.openbsd.dev_mkdb \
    -A pkgsCross.x86_64-openbsd.openbsd.dhcpleasectl \
    -A pkgsCross.x86_64-openbsd.openbsd.dhcpleased \
    -A pkgsCross.x86_64-openbsd.openbsd.dmesg \
    -A pkgsCross.x86_64-openbsd.openbsd.getent \
    -A pkgsCross.x86_64-openbsd.openbsd.getty \
    -A pkgsCross.x86_64-openbsd.openbsd.id \
    -A pkgsCross.x86_64-openbsd.openbsd.ifconfig \
    -A pkgsCross.x86_64-openbsd.openbsd.kdump \
    -A pkgsCross.x86_64-openbsd.openbsd.ktrace \
    -A pkgsCross.x86_64-openbsd.openbsd.kvm_mkdb \
    -A pkgsCross.x86_64-openbsd.openbsd.libexecinfo \
    -A pkgsCross.x86_64-openbsd.openbsd.libkvm \
    -A pkgsCross.x86_64-openbsd.openbsd.login \
    -A pkgsCross.x86_64-openbsd.openbsd.login_passwd \
    -A pkgsCross.x86_64-openbsd.openbsd.mtree \
    -A pkgsCross.x86_64-openbsd.openbsd.newsyslog \
    -A pkgsCross.x86_64-openbsd.openbsd.pfctl \
    -A pkgsCross.x86_64-openbsd.openbsd.pkill \
    -A pkgsCross.x86_64-openbsd.openbsd.pwd_mkdb \
    -A pkgsCross.x86_64-openbsd.openbsd.route \
    -A pkgsCross.x86_64-openbsd.openbsd.sed \
    -A pkgsCross.x86_64-openbsd.openbsd.shutdown \
    -A pkgsCross.x86_64-openbsd.openbsd.slaacctl \
    -A pkgsCross.x86_64-openbsd.openbsd.slaacd \
    -A pkgsCross.x86_64-openbsd.openbsd.su \
    -A pkgsCross.x86_64-openbsd.openbsd.swapctl \
    -A pkgsCross.x86_64-openbsd.openbsd.sysctl \
    -A pkgsCross.x86_64-openbsd.openbsd.syslogd \
    -A pkgsCross.x86_64-openbsd.openbsd.top \
    -A pkgsCross.x86_64-openbsd.openbsd.ttyflags \
    -A pkgsCross.x86_64-openbsd.openbsd.vmstat \
    -A pkgsCross.x86_64-openbsd.unixtools
 
error:
       … while evaluating the 'name' attribute of a derivation

       … while evaluating a branch condition
         at /home/pbsds/repos/nixpkgs/prs/pr-371699-1736933593/lib/strings.nix:2664:3:
         2663|   # First detect the common case of already valid strings, to speed those up
         2664|   if stringLength string <= 207 && okRegex string != null
             |   ^
         2665|   then unsafeDiscardStringContext string

       … in the left operand of the AND (&&) operator
         at /home/pbsds/repos/nixpkgs/prs/pr-371699-1736933593/lib/strings.nix:2664:33:
         2663|   # First detect the common case of already valid strings, to speed those up
         2664|   if stringLength string <= 207 && okRegex string != null
             |                                 ^
         2665|   then unsafeDiscardStringContext string

       (stack trace truncated; use '--show-trace' to show the full trace)

       error: attribute 'mount' missing
       at /home/pbsds/repos/nixpkgs/prs/pr-371699-1736933593/pkgs/top-level/unixtools.nix:147:17:
          146|       freebsd = freebsd.mount;
          147|       openbsd = pkgs.openbsd.mount;
             |                 ^
          148|       # technically just targeting the darwin version; binlore already

@rhelmot
Copy link
Contributor Author

rhelmot commented Jan 16, 2025

There was a commit missing that added openbsd.mount.

You can't build pkgsCross.x86_64-openbsd.unixtools as it's a package set that not everything is implemented for. Everything named in the diff should work, with the caveat that unixtools.watch will require #358066 (requires mass rebuild) to be merged first.

@pbsds pbsds merged commit b7c35fc into NixOS:master Jan 17, 2025
23 checks passed
@rhelmot rhelmot deleted the openbsd-misc branch January 17, 2025 20:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: bsd Running or building packages on BSD 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants