Skip to content

openssl_3_3: move cmake rm to correct phase#344139

Merged
emilazy merged 1 commit intoNixOS:staging-nextfrom
thillux:openssl-3.3-cmake-2
Sep 24, 2024
Merged

openssl_3_3: move cmake rm to correct phase#344139
emilazy merged 1 commit intoNixOS:staging-nextfrom
thillux:openssl-3.3-cmake-2

Conversation

@thillux
Copy link
Contributor

@thillux thillux commented Sep 24, 2024

Description of changes

I messed things up in a cleanup commit of #343991. Cmake + pkg-config helpers get moved to -dev in the fixup phase. So remove the cmake part in post-fixup again.

@emilazy Sry for the garbage I produced in my last PR :(

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.

Signed-off-by: Markus Theil <theil.markus@gmail.com>
@thillux thillux requested a review from emilazy September 24, 2024 05:58
@thillux thillux marked this pull request as ready for review September 24, 2024 05:59
@emilazy emilazy merged commit e6419ef into NixOS:staging-next Sep 24, 2024
@emilazy
Copy link
Member

emilazy commented Sep 24, 2024

Thankfully we’re reverting the GCC update so we’re rebuilding the world anyway 🫠

Should have tested more thoroughly but the builder died as I was trying Mumble, apologies.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants