Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 0e60d79f2a16
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c8ccfdb5f4a5
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 28, 2020

  1. zeroc-mcpp: decouple from original mcpp 

    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
    Christian Kauhaus committed Sep 28, 2020
    Copy the full SHA
    72d0f85 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2020

  1. Merge pull request #99017 from ckauhaus/98581-zeroc-mcpp 

    zeroc-mcpp: decouple from original mcpp
    Ninjatrappeur committed Oct 3, 2020
    Copy the full SHA
    c8ccfdb View commit details
    Browse the repository at this point in the history