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: 604c5208c597
Choose a base ref
...
head repository: NixOS/nix
compare: c129e7c8f484
Choose a head ref
  • 13 commits
  • 4 files changed
  • 4 contributors

Commits on May 21, 2020

  1. install: configure and bootstrap synthetic.conf on darwin 

    Starting macOS 10.15 /nix can't be creasted directly anymore due to the
readonly filesystem, but synthetic.conf was introduced to enable
creating mountpoints or symlinks for special usecases like package
managers.
    @LnL7
    LnL7 committed May 21, 2020
    Copy the full SHA
    0726ad5 View commit details
    Browse the repository at this point in the history

  2. install: also configure ~/.zshenv 

    The default login shell for users on macOS 10.15 changed from bash to
zsh.  So while generally nonstandard we need to configure it to make nix
function out of the box on macOS.
    @LnL7
    LnL7 committed May 21, 2020
    Copy the full SHA
    1020262 View commit details
    Browse the repository at this point in the history

  3. install: show macOS 10.15 message with --daemon

    @LnL7
    LnL7 committed May 21, 2020
    Copy the full SHA
    083bb3b View commit details
    Browse the repository at this point in the history

  4. manual: add apfs volume section

    @LnL7
    LnL7 committed May 21, 2020
    Copy the full SHA
    ee89b77 View commit details
    Browse the repository at this point in the history

  5. install: hide the store volume on darwin

    @LnL7
    LnL7 committed May 21, 2020
    1
    Copy the full SHA
    caface1 View commit details
    Browse the repository at this point in the history

  6. install: improve output and error handling

    @LnL7
    LnL7 committed May 21, 2020
    Copy the full SHA
    04f597c View commit details
    Browse the repository at this point in the history

  7. install: make synthetic.conf and fstab checks stricter

    @LnL7
    LnL7 committed May 21, 2020
    Copy the full SHA
    bc24c09 View commit details
    Browse the repository at this point in the history

  8. manual: clarify volume creation section

    @LnL7
    LnL7 committed May 21, 2020
    Copy the full SHA
    3386575 View commit details
    Browse the repository at this point in the history

  9. installer: refuse apfs volume creation when FileVault is enabled

    @LnL7
    LnL7 committed May 21, 2020
    Copy the full SHA
    477d7c2 View commit details
    Browse the repository at this point in the history

  10. focus on golden-path covering most scenarios 

    This should handle installation scenarios we can handle with
anything resembling confidence. Goal is approximating the existing
setup--not enforcing a best-practice...

Approaches (+ installer-handled, - manual) and configs each covers:

+ no change needed; /nix OK on boot volume:
  All pre-Catalina (regardless of T2 or FileVault use)

+ create new unencrypted volume:
  Catalina, pre-T2, no FileVault

+ create new encrypted-at-rest volume:
  Catalina, pre-T2, FileVault
  Catalina, T2, no FileVault

- require user to pre-create encrypted volume
  Catalina, T2, FileVault
    @abathur @LnL7
    abathur authored and LnL7 committed May 21, 2020
    1
    Copy the full SHA
    2b0a81d View commit details
    Browse the repository at this point in the history

  11. installer: don't clobber synthetic.conf

    @LnL7
    LnL7 committed May 21, 2020
    Copy the full SHA
    d3df188 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2020

  1. scripts/create-darwin-volume.sh: remove unused variable

    @domenkozar
    domenkozar committed May 23, 2020
    Copy the full SHA
    2a7ea2e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3212 from LnL7/darwin-10.15-install 

    install: configure and bootstrap synthetic.conf on darwin
    @domenkozar
    domenkozar committed May 23, 2020
    Copy the full SHA
    c129e7c View commit details
    Browse the repository at this point in the history