Skip to content

setools: refactor#383882

Merged
GaetanLepage merged 1 commit intoNixOS:stagingfrom
bengsparks:setools
Mar 6, 2025
Merged

setools: refactor#383882
GaetanLepage merged 1 commit intoNixOS:stagingfrom
bengsparks:setools

Conversation

@bengsparks
Copy link
Contributor

@bengsparks bengsparks commented Feb 21, 2025 •
edited
Loading

Part of efforts to finish #349607.
Supersedes / Closes #349733. Removes dependency on enum34 and fixes merge conflict while maintaining authorship.

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/)
  • 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.

@bengsparks bengsparks mentioned this pull request Feb 21, 2025
Closed
13 tasks
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Feb 21, 2025
@bengsparks
Copy link
Contributor Author

bengsparks commented Feb 21, 2025 •
edited
Loading

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 383882

x86_64-linux

❌ 2 packages failed to build:
  • selinux-python
  • selinux-sandbox
✅ 2 packages built:
  • setools
  • setools.dist

aarch64-linux

❌ 2 packages failed to build:
  • selinux-python
  • selinux-sandbox
✅ 2 packages built:
  • setools
  • setools.dist

Build errors match #369417, which are resolved by #381014, which targets staging.

@bengsparks bengsparks mentioned this pull request Feb 21, 2025
Closed
21 tasks
@bengsparks bengsparks changed the base branch from master to staging February 21, 2025 11:49
@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Feb 21, 2025

Why is this targetting staging?

@bengsparks
Copy link
Contributor Author

bengsparks commented Feb 21, 2025

@SuperSandro2000 My PR requires changes from #381014, which targets staging, so I thought I had to adjust my PR accordingly. Should this target master instead?

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Feb 21, 2025

Ah okay. Didn't see that

GaetanLepage
GaetanLepage reviewed Feb 27, 2025
View reviewed changes
@GaetanLepage
Copy link
Contributor

GaetanLepage commented Feb 27, 2025

Formatting issue.

@bengsparks
Copy link
Contributor Author

bengsparks commented Feb 27, 2025 •
edited
Loading

Darn missing trailing comma 😂 should be fixed now.
EDIT: It's not; meta.mainProgram is expected to be set, but the repository is a toolkit, so it contains 7 different programs. Do I just set any one of them, or can you point me to a package that specifies multiple programs? @GaetanLepage

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Feb 27, 2025

That warning is from libsepol

@bengsparks
Copy link
Contributor Author

bengsparks commented Feb 27, 2025 •
edited
Loading

Indeed it is (Food now, more updates later!)

@RossComputerGuy
Copy link
Member

RossComputerGuy commented Feb 27, 2025

That warning is from libsepol

Very strange, it shouldn't because libsepol doesn't exactly have a main program. I'm checking the PR out and gonna see if I can grab a stack trace. Hopefully that gives us some answers. I grepped nixpkgs itself and didn't find anything obvious which would cause this issue.

@RossComputerGuy RossComputerGuy mentioned this pull request Feb 27, 2025
Merged
13 tasks
@RossComputerGuy
Copy link
Member

RossComputerGuy commented Feb 27, 2025

I have a fix in #385646, the problem is meta.name in checkpolicy is confusing things. I added a main program to checkpolicy so it should eval now.

@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: qt/kde Object-oriented framework for GUI creation 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. labels Mar 5, 2025
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 5, 2025
@nix-owners
Copy link

nix-owners bot commented Mar 5, 2025

The PR's base branch is set to staging, but 111 commits from the master branch are included. Make sure you know the right base branch for your changes, then:

  • If the changes should go to the master branch, change the base branch to master
  • If the changes should go to the staging branch, rebase your PR onto the merge base with the staging branch: 
    # git rebase --onto $(git merge-base upstream/staging HEAD) $(git merge-base upstream/master HEAD)
git rebase --onto 3265fe46d70429493444910b6f2fe24ebedf6705 267461dafbec400dd438ac27ab2a3c7775b8a42d
git push --force-with-lease

@github-actions github-actions bot removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: lib The Nixpkgs function library 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 6.topic: dotnet Language: .NET labels Mar 5, 2025
@bengsparks bengsparks marked this pull request as draft March 5, 2025 16:25
@github-actions github-actions bot removed 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: vim Advanced text editor 6.topic: stdenv Standard environment 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 6.topic: php PHP is a general-purpose scripting language geared towards web development. labels Mar 5, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 5, 2025
@bengsparks bengsparks marked this pull request as ready for review March 5, 2025 16:29
@bengsparks bengsparks requested a review from GaetanLepage March 6, 2025 01:00
GaetanLepage
GaetanLepage reviewed Mar 6, 2025
View reviewed changes
@GaetanLepage
Copy link
Contributor

GaetanLepage commented Mar 6, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 383882

x86_64-linux

✅ 4 packages built:
  • selinux-python
  • selinux-sandbox
  • setools
  • setools.dist

aarch64-linux

✅ 4 packages built:
  • selinux-python
  • selinux-sandbox
  • setools
  • setools.dist

GaetanLepage
GaetanLepage approved these changes Mar 6, 2025
View reviewed changes
Copy link
Contributor

@GaetanLepage GaetanLepage left a comment

Choose a reason for hiding this comment

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

LGTM, thanks :)

@GaetanLepage GaetanLepage merged commit 0d3f8c8 into NixOS:staging Mar 6, 2025
25 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GaetanLepage GaetanLepage GaetanLepage approved these changes

Assignees

No one assigned

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@bengsparks @SuperSandro2000 @GaetanLepage @RossComputerGuy