Skip to content

freebsd: improve overridability of entire package set#339912

Merged
Ericson2314 merged 1 commit intoNixOS:masterfrom
rhelmot:freebsd-overridable
Nov 25, 2024
Merged

freebsd: improve overridability of entire package set#339912
Ericson2314 merged 1 commit intoNixOS:masterfrom
rhelmot:freebsd-overridable

Conversation

@rhelmot
Copy link
Contributor

@rhelmot rhelmot commented Sep 5, 2024

Description of changes

See commit. Basically, this lets us use a simple overlay in order to build FreeBSD 15.0-CURRENT!

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.

@ofborg ofborg 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 Sep 5, 2024
@rhelmot rhelmot added the 6.topic: bsd Running or building packages on BSD label Sep 6, 2024
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 10, 2024
@rhelmot rhelmot force-pushed the freebsd-overridable branch 2 times, most recently from 07759db to c8ebd00 Compare November 19, 2024 23:08
@Ericson2314
Copy link
Member

Ericson2314 commented Nov 19, 2024

Could we do the overrideFilterSrc in a different PR? Only because I am not sure the makeOverridable in mkDerivation was ever a good idea.

Otherwise looks good.

- remove duplicated patches directory attribute
- make several version number checks >= or <= instead of ==
- add kernel derivation parameters to adjust build config
@rhelmot rhelmot force-pushed the freebsd-overridable branch from c8ebd00 to c565ccd Compare November 19, 2024 23:24
@rhelmot
Copy link
Contributor Author

rhelmot commented Nov 19, 2024

done

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 20, 2024
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 20, 2024
@Ericson2314 Ericson2314 merged commit 428141a into NixOS:master Nov 25, 2024
@Ericson2314 Ericson2314 deleted the freebsd-overridable branch November 25, 2024 23:01
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. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants