Skip to content

Remove ca-derivations removeReferencesTo#359318

Merged
Ericson2314 merged 3 commits intoNixOS:stagingfrom
gador:remove-ca-remove-references-to
Nov 27, 2024
Merged

Remove ca-derivations removeReferencesTo#359318
Ericson2314 merged 3 commits intoNixOS:stagingfrom
gador:remove-ca-remove-references-to

Conversation

@gador
Copy link
Member

@gador gador commented Nov 26, 2024 •
edited
Loading

This reverts remove-references-to fixups added for CA-derivations, which isn't needed anymore after the merge of #359098

This specifically reverts the PRs:

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.

gador added 3 commits November 26, 2024 15:53
@gador
firefox: remove removeReferencesTo
3376e63 
reverts f3d1410

After the merge of NixOS#359098 this workarround for ca-derivations
isn't needed anymore.

Signed-off-by: Florian Brandes <[email protected]>
@gador
Revert "libwebsockets: fix build for ca-derivations"
5d1d70c 
This reverts commit 43fccb0.

After the merge of NixOS#359098 this workarround for ca-derivations
isn't needed anymore.

Signed-off-by: Florian Brandes <[email protected]>
@gador
neovim: remove removeReferencesTo
0f6e04e 
reverts 9305ed3

After the merge of NixOS#359098 this workarround for ca-derivations
isn't needed anymore.

Signed-off-by: Florian Brandes <[email protected]>
@gador gador mentioned this pull request Nov 26, 2024
Closed
13 tasks
@gador gador changed the title Remove ca remove references to Remove ca-derivations removeReferencesTo Nov 26, 2024
Ericson2314
Ericson2314 approved these changes Nov 26, 2024
View reviewed changes
Copy link
Member

@Ericson2314 Ericson2314 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Thanks!

(But you need to remove the ruby one and send it to staging instead.)

@gador
Copy link
Member Author

gador commented Nov 26, 2024

Thanks!

(But you need to remove the ruby one and send it to staging instead.)

Sorry I didn't add that this PR does not undo the ruby one. The commit f391429 doesn't really add a removeReferencesTo but replaces a ${removeReferencesTo}/bin/remove-references-to with remove-references-to so I would leave it alone

@emilazy
Copy link
Member

emilazy commented Nov 26, 2024

It changes disallowedRequisites, though; are we sure that change is correct?

@gador
Copy link
Member Author

gador commented Nov 26, 2024

It changes disallowedRequisites, though; are we sure that change is correct?

Good question. I'm not familiar with ruby in any way to answer that

@Ericson2314
Copy link
Member

Ericson2314 commented Nov 26, 2024

This can be undrafted, right? The disallowedRequisites conversation is about the stuff that is not included, right?

@gador
Copy link
Member Author

gador commented Nov 27, 2024

Yes, I haven't found any more ca fixes to revert

@gador gador marked this pull request as ready for review November 27, 2024 05:01
@nix-owners nix-owners bot requested a review from mweinelt November 27, 2024 05:03
@ofborg ofborg bot requested review from Mindavi, manveru and rvolosatovs November 27, 2024 10:34
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Nov 27, 2024
@gador gador changed the base branch from master to staging November 27, 2024 13:41
@Ericson2314 Ericson2314 merged commit f38a03f into NixOS:staging Nov 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Ericson2314 Ericson2314 Ericson2314 approved these changes

@Mindavi Mindavi Mindavi approved these changes

@mweinelt mweinelt Awaiting requested review from mweinelt

@rvolosatovs rvolosatovs Awaiting requested review from rvolosatovs

@manveru manveru Awaiting requested review from manveru

Assignees

No one assigned

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@gador @emilazy @Ericson2314 @Mindavi