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: 8a06edbf7e98
Choose a base ref
...
head repository: NixOS/nix
compare: 97dc44f3d6f8
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 3, 2020

  1. Check for rosetta 2 support before installing

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

  2. Call it aarch64-darwin instead of arm64-darwin 

    gnu-config standardized on aarch64 for machine name so host_cpu part
of $system will always be aarch64. That means system will be
aarch64-darwin too.

uname however could report either “aarch64” (if gnu coreutils) or
“arm64” (if apple’s uname). We should support both for compatiblity
here.
    @matthewbauer
    matthewbauer committed Dec 3, 2020
    Copy the full SHA
    addf9f4 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2020

  1. Use com.apple.oahd.plist for rosetta 2 detection

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

Commits on Dec 7, 2020

  1. Merge pull request #4305 from matthewbauer/rosetta2-check 

    Check for rosetta 2 support before installing x86_64-darwin Nix
    @edolstra
    edolstra committed Dec 7, 2020
    Copy the full SHA
    97dc44f View commit details
    Browse the repository at this point in the history