Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

zeroc-mcpp: decouple from original mcpp #99017

Merged
merged 1 commit into from Oct 3, 2020
Merged

zeroc-mcpp: decouple from original mcpp #99017

merged 1 commit into from Oct 3, 2020

Conversation

ckauhaus
Copy link
Contributor

Motivation for this change

zeroc-ice used to smuggle a forked mcpp version in with an override,
which broke after applying a security patch against mcpp in
c60cafa. Overriding instead of defining
a new derivation is a questionable optimization since in fact, only the
'configureFlags' line is shared.

Remove the override and give the forked mcpp a live on its own.

The security patch for mcpp is not relevant for this fork.

Fix #98581

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions Ubuntu
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of *some& pkgs that depend on this change: murmur
  • Tested execution of all binary files (usually in ./result/bin/) N/A
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Cc @abbradar @K900 @sumnerevans

zeroc-mcpp: decouple from original mcpp
72d0f85 
zeroc-ice used to smuggle a forked mcpp version in with an override,
which broke after applying a security patch against mcpp in
c60cafa. Overriding instead of defining
a new derivation is a questionable optimization since in fact, only the
'configureFlags' line is shared.

Remove the override and give the forked mcpp a live on its own.

The security patch for mcpp is not relevant for this fork.

Fix NixOS#98581
@picnoir
Copy link
Member

picnoir commented Oct 3, 2020

FYI, the security patch is already applied on the fork. See

I do think it's relevant for mumble (which is currently broken).

picnoir
picnoir approved these changes Oct 3, 2020
View reviewed changes
Copy link
Member

@picnoir picnoir left a comment •
edited

Choose a reason for hiding this comment

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

Thanks! LGTM.

Quite some packages, including mumble and murmur are depending on this.

@picnoir picnoir merged commit c8ccfdb into NixOS:master Oct 3, 2020
@ckauhaus ckauhaus deleted the 98581-zeroc-mcpp branch October 7, 2020 13:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@picnoir picnoir picnoir approved these changes

@abbradar abbradar Awaiting requested review from abbradar

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

mcpp update broke zeroc-ice compilation
2 participants
@ckauhaus @picnoir