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/nix
base: abbf9df7b1c4
Choose a base ref
...
head repository: NixOS/nix
compare: bff706e27cea
Choose a head ref
  • 4 commits
  • 6 files changed
  • 2 contributors

Commits on Dec 24, 2020

  1. Cast variants fully for libc++10 

    libc++10 seems to be stricter on what it allows in variant conversion.
I'm not sure what the rules are here, but this is the minimal change
needed to get through the compilation errors.
    @matthewbauer
    matthewbauer committed Dec 24, 2020
    Copy the full SHA
    d487046 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into support-libcxx10

    @matthewbauer
    matthewbauer committed Dec 24, 2020
    Copy the full SHA
    ede534a View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2020

  1. Fixup

    @matthewbauer
    matthewbauer committed Dec 29, 2020
    Copy the full SHA
    64904b9 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2020

  1. Merge pull request #4397 from matthewbauer/support-libcxx10 

    Cast variants fully for libc++10
    @edolstra
    edolstra committed Dec 30, 2020
    Copy the full SHA
    bff706e View commit details
    Browse the repository at this point in the history