1
1
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-09-11 12:49:18 +03:00
Commit Graph

100 Commits

Author SHA1 Message Date
Sandro Stikić
ae73fc3b03
Don't reset experimental features 2022-02-04 16:16:08 +08:00
Domen Kožar
16c9343b25 move installer into a separate file 2022-01-11 14:14:42 +01:00
Travis A. Everett
94c3e407dd fix dependence on apfs.util exit code
apfs.util (or at least it's newer -t flag) has bad exit code semantics
and will return non-zero codes for both success and errors.

Closes #401 and most-likely fixes #378 as well
2021-12-21 10:07:23 -06:00
Daiderd Jordan
e8f4288d16
uninstaller: copy services instead of symlinking 2021-12-21 15:42:45 +01:00
Daiderd Jordan
44da835ac4
add forward compatibility for literalExample deprecation
Fixes #367
2021-10-23 15:06:42 +02:00
Kid
a732ed4851
uninstaller: also remove ~/Applications/Nix Apps 2021-08-10 21:41:35 +08:00
Daiderd Jordan
a7492a8c76
Merge pull request #308 from hardselius/master
Fix nix flake info error
2021-04-06 09:20:09 +02:00
Martin Hardselius
1f8eb9b128
Add nix flags to subcommand test
This change removes the need for having

  experimental-features = nix-command flakes

in nix.conf. It should also work outside of flake directories.
2021-03-23 09:49:47 +01:00
Martin Hardselius
4187519820
Make nix flake info fix backwards compatible
This change handles previous nix versions by testing for the presence of
the `metadata` subcommand and falling back on the `info` subcommand if
it does not exist.
2021-03-22 22:17:48 +01:00
Martin Hardselius
93752a83ea
Fix nix flake info error
Fixes "error: 'info' is not a recognised command'"

Issue: #307
2021-03-21 23:54:10 +01:00
Mario Rodas
e78f90f795 darwin-[un]installer: Don't reference deprecated stdenv.lib
`stdenv.lib` has been deprecated, and the correct approach is to use
`lib` directly through `pkgs.lib`.
2021-02-23 04:20:00 +00:00
Daiderd Jordan
8834df4317
installer: silence apfs.util output
Passing incorrect flags prints help output to stdout so silence
everything.

Fixes #264
2020-12-22 10:14:02 +01:00
Daiderd Jordan
f8a04c7f6d
installer: move channel setup out of activation
Fixes #234
2020-12-21 14:23:25 +01:00
Daiderd Jordan
6dd655466d
installer: remove profile step 2020-12-19 12:38:06 +01:00
Daiderd Jordan
f47083bd71
installer: extend test with shell environment checks 2020-12-18 14:53:09 +01:00
Daiderd Jordan
75cab75c22
installer: ensure /etc/static runs last
In the case that nix-darwin was installed for a single user installation
and later nix gets reinstalled with the daemon it's possible that
nix-daemon.sh loads afterwards, resulting in unexpected behaviour.
2020-12-18 14:53:08 +01:00
Daiderd Jordan
c6f44ea7ff
installer: handle apfs.util on macOS 11.0 Big Sur
The flages of apfs.util changed in 11.0 so try both cases.

Fixes #249
2020-11-15 15:17:13 +01:00
Daiderd Jordan
8800c4717d
always prefix flake with darwinConfigurations 2020-10-21 18:30:57 +02:00
Daiderd Jordan
c8b38819b4
handle --print-build-logs for flakes 2020-10-21 18:30:57 +02:00
Daiderd Jordan
e4c3940e2d
add --impure flag for flakes 2020-10-21 18:30:57 +02:00
Daiderd Jordan
d865c6ae4c
add example flake and support --flake in darwin-rebuild 2020-10-21 18:30:57 +02:00
Daiderd Jordan
943a6b25d7
Merge pull request #215 from basvandijk/installer-correct-referencees
darwin-[un]installer: make sure all dependencies are part of the closure
2020-08-26 18:21:07 +02:00
Alexandre Esteves
a6f47f87f1
Fix typo 2020-08-26 13:19:51 +01:00
Bas van Dijk
03d3931656 darwin-[un]installer: make sure all dependencies are part of the closure
This makes sure the `darwin-installer` and `darwin-uninstaller`
packages can be nix copied to any target and reliably be executed
there.
2020-08-21 21:22:09 +02:00
Daiderd Jordan
47fe6db9c9
darwin-installer: configure zsh 2020-06-17 19:37:33 +02:00
James Ottaway
32fa78821f Only enable services.nix-daemon when no config is present upon install 2020-05-17 21:58:35 +10:00
Daiderd Jordan
80a8a591a9
installer: try creating /run using synthetic.conf
Since macOS 10.15 Catalina / can't be changed directly anymore.

Fixes #166
2020-03-28 19:12:21 +01:00
Daiderd Jordan
590e9c872a
darwin-rebuild: allow empty arguments
The wrapper already handles whitespace properly and empty values are
useful for certain flags like --option builders ''.
2020-02-03 22:49:46 +01:00
Daiderd Jordan
3ec36dd667
darwin-installer: add missing shebang
Unclear in which conditions this does or doesn't work but using a
shebang is best practice and ensures an ancient version of bash isn't
used.

Fixes #179
2019-12-14 18:13:33 +01:00
Daiderd Jordan
462a17b1f1
installer: detect multi-user install 2019-07-01 23:02:29 +02:00
Daiderd Jordan
bbedef2143
darwin-rebuild: fix check 2019-07-01 22:42:44 +02:00
Domen Kožar
48a9159b35
darwin-installer: use --show-trace
This saved me some debugging
2019-06-25 19:50:37 +02:00
Daiderd Jordan
7aa0ad23f4
darwin-rebuild: fix activate without an existing profile 2019-06-05 23:23:59 +02:00
Daiderd Jordan
24089a93d7
darwin-rebuild: add activate command
This command activates the current system again, mostly useful when the
system was built on another host and substituted.
2019-06-05 22:59:23 +02:00
Daiderd Jordan
ae58eb80d2
nix-script: remove 2019-06-05 21:45:47 +02:00
Daiderd Jordan
3c4a001d99
nixos-rebuild: change default editor to vi 2019-06-05 21:45:47 +02:00
Daiderd Jordan
71c68087e8
darwin-rebuild: fix quoting 2019-06-05 21:45:46 +02:00
Daiderd Jordan
2cda9f7113
darwin-option: add support for -I 2019-05-01 13:26:04 +02:00
Daiderd Jordan
d00d00998e
darwin: replace usages of nix-instantiate --eval with --find-file 2019-02-24 22:27:41 +01:00
Daiderd Jordan
132a7f0a09 users: increase default nixbld users to 32 and set knownUsers by default
Since the users.nix.configureBuildUsers target nixbld users, don't require
them to be added to knownUsers explicitly.
2019-02-21 23:15:09 +01:00
Daiderd Jordan
34a6eca033
Revert "installer: add NIX_PATH fallback in <darwin> lookup"
This reverts commit 06f8d83f60.
2018-10-27 00:14:38 +01:00
Daiderd Jordan
63dfbc93d5
installer: include channels in bootstrap NIX_PATH 2018-10-26 17:47:45 +01:00
Daiderd Jordan
06f8d83f60
installer: add NIX_PATH fallback in <darwin> lookup
The nix.nixPath option doesn't include everything, some paths are added
dynamically now.
2018-10-26 17:09:19 +01:00
Daiderd Jordan
79d356909b
installer: don't use pure PATH for editor
For the rest of the installer we want to make sure nothing installed by
the user interferes, however a user's editor might be installed
anywhere.
2018-10-26 09:10:28 +01:00
Daiderd Jordan
803bf18141
uninstaller: continue if removing channel fails and make nix-daemon reload more robust
Kind of a workaround, but failing to remove the channel isn't a big
deal.
2018-09-14 22:32:49 +02:00
Daiderd Jordan
75add386d3
installer: prefer nix from default profile
Using a nix 2.1 nix-channel/nix-env with a 2.0 nix-daemon doesn't work
because the buildenv implementation was moved to the daemon.  This means
the nix version of the target darwin system can't be used because the
daemon isn't upgraded yet.

    error: unsupported builtin function 'buildenv'
2018-09-14 22:29:08 +02:00
Daiderd Jordan
958ebb7966
darwin-rebuild: don't run nix-build for edit 2018-08-03 20:16:43 +02:00
zimbatm
a25d345a7e darwin-rebuild edit
As a user I don't want to remember where the configuration exists. This
adds a command that will point the $EDITOR to the <darwin-config> file.

    darwin-rebuild edit
2018-08-03 15:13:42 +01:00
Daiderd Jordan
a893723b95
activation: fix missing /sbin entries in PATH 2018-08-01 21:08:13 +02:00
Kirill Elagin
45f0e832cd fixup! installer and activation: Sanitise PATH 2018-06-29 19:05:57 +03:00