Skip to content

fortify-headers: 1.1alpine1 -> 1.1alpine3#251768

Merged
risicle merged 1 commit intoNixOS:stagingfrom
risicle:ris-fortify-headers-1.1alpine3
Aug 28, 2023
Merged

fortify-headers: 1.1alpine1 -> 1.1alpine3#251768
risicle merged 1 commit intoNixOS:stagingfrom
risicle:ris-fortify-headers-1.1alpine3

Conversation

@risicle
Copy link
Contributor

@risicle risicle commented Aug 27, 2023

Description of changes

The relevant changes in this bump are the addition of some patches fixing behaviour with clang. I think we're still going to have to patch fortify-headers further to make it more easily disable-able for clang (if not just disable it entirely for clang) but this is a start.

Have built a lot of pkgsMusl packages on nixos x86_64 with this.

cc @NixOS/static

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.11 Release Notes (or backporting 23.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.

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Aug 27, 2023
@risicle risicle marked this pull request as ready for review August 28, 2023 00:12
@risicle risicle requested a review from yu-re-ka August 28, 2023 00:12
@risicle risicle force-pushed the ris-fortify-headers-1.1alpine3 branch from 61a5b26 to dbe7ef1 Compare August 28, 2023 09:59
@risicle risicle changed the base branch from staging-next to staging August 28, 2023 09:59
@risicle
Copy link
Contributor Author

risicle commented Aug 28, 2023

On second thoughts this probably isn't urgent enough to go to staging-next.

@risicle risicle added 6.topic: stdenv Standard environment 6.topic: musl Running or building packages with musl libc labels Aug 28, 2023
@yu-re-ka
Copy link
Contributor

yu-re-ka commented Aug 28, 2023

Since it doesn't have many (hydra) rebuilds, I think it should go into master.

@risicle
Copy link
Contributor Author

risicle commented Aug 28, 2023

Well, it's a full rebuild for musl users.

@yu-re-ka
Copy link
Contributor

yu-re-ka commented Aug 28, 2023

define "musl users". I have a device that's running full nixos with musl, but that can't be upgraded to current master because of too many build failures being introduced in the last two staging cycles, some of which would be fixed by this.
On the other hand people who do one-off musl package builds probably don't care either.
Generally, I think we care about hydra rebuilds.

@risicle
Copy link
Contributor Author

risicle commented Aug 28, 2023

Well it's more that I foresee having to add a couple more fixes for this, and it would be better to trigger rebuilds for people once, rather that twice or three times.

Would it be better if we merged #251942 to make this a completely non-urgent problem?

@yu-re-ka
Copy link
Contributor

Would it be better if we merged #251942 to make this a completely non-urgent problem?

Either that or revert #219421 for now and then re-submit it together with other fixes?

@risicle
Copy link
Contributor Author

risicle commented Aug 28, 2023

#219421 is unrelated. nope that's the one

@yu-re-ka
Copy link
Contributor

which PR introduced the fortify-headers for musl libc then?

@risicle
Copy link
Contributor Author

risicle commented Aug 28, 2023

No wait, you're right - I've got my numbers mixed up.

@yu-re-ka
Copy link
Contributor

Let's merge this into staging and #251942 into master, and then we're good for now and can figure out how to make it work with clang at some point

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: musl Running or building packages with musl libc 6.topic: stdenv Standard environment 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants