Skip to content

{ruby,neovim}: fix build with content-addressed derivations#258705

Merged
marsam merged 2 commits intoNixOS:stagingfrom
tie:fix-ca-derivations-disallowed
Mar 24, 2024
Merged

{ruby,neovim}: fix build with content-addressed derivations#258705
marsam merged 2 commits intoNixOS:stagingfrom
tie:fix-ca-derivations-disallowed

Conversation

@tie
Copy link
Member

@tie tie commented Oct 3, 2023

Description of changes

This PR fixes some packages that were broken after #211783 with contentAddressedByDefault. See #211783 (comment), #211783 (comment), and #214044 (comment)

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.

@github-actions github-actions bot added 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: vim Advanced text editor labels Oct 3, 2023
@tie
Copy link
Member Author

tie commented Oct 3, 2023

Wrt #211783, I think this should be a separate parameter for mkDerivation instead of overriding the meaning of (dis)allowed{References,Requisites} by discarding the context (breaking content-addressed derivations along the way).

@tie tie marked this pull request as ready for review October 3, 2023 03:13
@ofborg ofborg bot requested review from manveru, rvolosatovs and vrthra October 3, 2023 03:24
@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: 2501-5000 This PR causes many rebuilds on Darwin and should 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: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Oct 3, 2023
@tie tie requested a review from thufschmitt October 3, 2023 03:41
@Artturin
Copy link
Member

Artturin commented Oct 5, 2023 •
edited
Loading

Should target staging, follow contributing.md to rebase. Undraft once done.

@Artturin Artturin marked this pull request as draft October 5, 2023 04:30
@tie
Copy link
Member Author

tie commented Oct 5, 2023

I don’t think a rebase is necessary.

$ git rebase --onto upstream/staging... upstream/master
Current branch fix-ca-derivations-disallowed is up to date.

@tie tie changed the base branch from master to staging October 5, 2023 06:15
@tie tie marked this pull request as ready for review October 5, 2023 06:16
DarkKirb added a commit to DarkKirb/nix-packages that referenced this pull request Nov 7, 2023
@DarkKirb
Hotfix ruby and neovim build
58d4b94 
Remove after NixOS/nixpkgs#258705
@Artturin Artturin requested a review from r-vdp November 7, 2023 23:02
@marsam marsam mentioned this pull request Jan 2, 2024
Closed
@ConnorBaker
Copy link
Contributor

ConnorBaker commented Feb 8, 2024

This is kind of difficult to review due to the number of rebuilds. Any suggestions for a more limited way to run nixpkgs-review which verifies that this 1) fixes the problem and 2) doesn't break anything else?

@r-vdp
Copy link
Contributor

r-vdp commented Feb 8, 2024

Why do we have stdenv.cc for neovim and stdenv.cc.cc for ruby, in disallowedRequisites ?

@pillowtrucker
Copy link
Contributor

pillowtrucker commented Mar 22, 2024

fwiw I've been testing the ruby side of this for 2 days and haven't had any issues

marsam
marsam approved these changes Mar 24, 2024
View reviewed changes
Copy link
Contributor

@marsam marsam left a comment

Choose a reason for hiding this comment

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

Thank you!

@marsam marsam merged commit 28e51c9 into NixOS:staging Mar 24, 2024
@tie tie deleted the fix-ca-derivations-disallowed branch May 3, 2024 06:42
@tie tie mentioned this pull request May 30, 2024
Merged
13 tasks
@magneticflux- magneticflux- mentioned this pull request Aug 23, 2024
Closed
@gador gador mentioned this pull request Nov 26, 2024
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@figsoda figsoda Awaiting requested review from figsoda

@jonringer jonringer Awaiting requested review from jonringer

@teto teto Awaiting requested review from teto

@manveru manveru Awaiting requested review from manveru

@vrthra vrthra Awaiting requested review from vrthra

@rvolosatovs rvolosatovs Awaiting requested review from rvolosatovs

@thufschmitt thufschmitt Awaiting requested review from thufschmitt

@r-vdp r-vdp Awaiting requested review from r-vdp

1 more reviewer

@marsam marsam marsam approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: vim Advanced text editor 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should 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: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@tie @Artturin @ConnorBaker @r-vdp @pillowtrucker @marsam