Merge remote-tracking branch 'upstream/master' into fork-fix-launchd-…

…calendar-interval

.github/workflows/test.yml

@@ -4,7 +4,7 @@ on:
   push:
 
 env:
-  CURRENT_STABLE_CHANNEL: nixpkgs-23.05-darwin
+  CURRENT_STABLE_CHANNEL: nixpkgs-23.11-darwin
 
 jobs:
   test-stable:
@@ -13,9 +13,9 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Install nix corresponding to latest stable channel
-      uses: cachix/install-nix-action@v22
+      uses: cachix/install-nix-action@v23
       with:
-        install_url: https://github.com/nix-community/nix-unstable-installer/releases/download/nix-2.10.0pre20220822_7c3ab57/install
+        install_url: https://releases.nixos.org/nix/nix-2.13.6/install
     - run: nix-build ./release.nix -I nixpkgs=channel:${{ env.CURRENT_STABLE_CHANNEL }} -I darwin=. -A tests
     - run: nix-build ./release.nix -I nixpkgs=channel:${{ env.CURRENT_STABLE_CHANNEL }} -I darwin=. -A manpages
     - run: nix-build ./release.nix -I nixpkgs=channel:${{ env.CURRENT_STABLE_CHANNEL }} -I darwin=. -A examples.simple
@@ -26,7 +26,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Install nix from current unstable channel
-      uses: cachix/install-nix-action@v22
+      uses: cachix/install-nix-action@v23
     - run: nix-build ./release.nix -I nixpkgs=channel:nixpkgs-unstable -I darwin=. -A tests
     - run: nix-build ./release.nix -I nixpkgs=channel:nixpkgs-unstable -I darwin=. -A manpages
     - run: nix-build ./release.nix -I nixpkgs=channel:nixpkgs-unstable -I darwin=. -A examples.simple
@@ -37,9 +37,9 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Install nix corresponding to latest stable channel
-      uses: cachix/install-nix-action@v22
+      uses: cachix/install-nix-action@v23
       with:
-        install_url: https://github.com/nix-community/nix-unstable-installer/releases/download/nix-2.10.0pre20220822_7c3ab57/install
+        install_url: https://releases.nixos.org/nix/nix-2.13.6/install
         nix_path: nixpkgs=channel:${{ env.CURRENT_STABLE_CHANNEL }}
     - name: Install ${{ env.CURRENT_STABLE_CHANNEL }} channel
       run: |
@@ -82,7 +82,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Install nix from current unstable channel
-      uses: cachix/install-nix-action@v22
+      uses: cachix/install-nix-action@v23
       with:
         nix_path: nixpkgs=channel:nixpkgs-unstable
     - name: Install nixpkgs-unstable channel
@@ -126,9 +126,9 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Install nix version corresponding to latest stable channel
-      uses: cachix/install-nix-action@v22
+      uses: cachix/install-nix-action@v23
       with:
-        install_url: https://github.com/nix-community/nix-unstable-installer/releases/download/nix-2.10.0pre20220822_7c3ab57/install
+        install_url: https://releases.nixos.org/nix/nix-2.13.6/install
     - name: Install nix-darwin
       run: |
         mkdir -p ~/.config/nix-darwin
@@ -209,7 +209,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Install nix from current unstable channel
-      uses: cachix/install-nix-action@v22
+      uses: cachix/install-nix-action@v23
     - name: Install nix-darwin
       run: |
         mkdir -p ~/.config/nix-darwin

.github/workflows/update-manual.yml

@@ -21,7 +21,7 @@ jobs:
 
     - name: Build manual
       run: |
-        nix-build ./release.nix -I nixpkgs=channel:nixpkgs-23.05-darwin -I darwin=. -A manualHTML
+        nix-build ./release.nix -I nixpkgs=channel:nixpkgs-23.11-darwin -I darwin=. -A manualHTML
 
     - name: Push update to manual
       run: |

README.md

@@ -13,7 +13,7 @@ nix-darwin is built up around [Nixpkgs](https://github.com/NixOS/nixpkgs), quite
 
 To install nix-darwin, a working installation of [Nix](https://github.com/NixOS/nix#installation) is required.
 
-> NOTE: Using `darwin-installer` is no longer necessary on flake based systems.
+If you wish to use nix-darwin with flakes, please refer to the [flakes](#flakes) section.
 
 ```bash
 nix-build https://github.com/LnL7/nix-darwin/archive/master.tar.gz -A installer
@@ -69,10 +69,9 @@ Configuration lives in `~/.nixpkgs/darwin-configuration.nix`. Check out
 }
 ```
 
-## Flakes (experimental)
+## Flakes
 
-There is also preliminary support for building your configuration using a [flake](https://nixos.wiki/wiki/Flakes).  This
-is mostly based on the flake support that was added to NixOS.
+nix-darwin aims for both non-flake and flake configurations to be well supported despite flakes being an experimental feature in Nix.
 
 ### Step 1. Creating `flake.nix`
 
@@ -86,11 +85,10 @@ If you don't have an existing `configuration.nix`, you can run the following com
 mkdir -p ~/.config/nix-darwin
 cd ~/.config/nix-darwin
 nix flake init -t nix-darwin
+sed -i '' "s/simple/$(scutil --get LocalHostName)/" flake.nix
 ```
 
-Make sure to replace all occurrences of `simple` with your short hostname which you can find by running `hostname -s`.
-
-> NOTE: Make sure to change `nixpkgs.hostPlatform` to `aarch64-darwin` if you are using Apple Silicon.
+Make sure to change `nixpkgs.hostPlatform` to `aarch64-darwin` if you are using Apple Silicon.
 
 </details>
 
@@ -105,8 +103,8 @@ Add the following to `flake.nix` in the same folder as `configuration.nix`:
   description = "John's darwin system";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-23.05-darwin";
-    nix-darwin.url = "github:LnL7/nix-darwin/master";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-23.11-darwin";
+    nix-darwin.url = "github:LnL7/nix-darwin";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
   };
 
@@ -118,9 +116,9 @@ Add the following to `flake.nix` in the same folder as `configuration.nix`:
 }
 ```
 
-Make sure to replace `Johns-MacBook` with your short hostname which you can find by running `hostname -s`.
+Make sure to replace `Johns-MacBook` with your hostname which you can find by running `scutil --get LocalHostName`.
 
-> NOTE: Make sure to set `nixpkgs.hostPlatform` in your `configuration.nix` to either `x86_64-darwin` (Intel) or `aarch64-darwin` (Apple Silicon).
+Make sure to set `nixpkgs.hostPlatform` in your `configuration.nix` to either `x86_64-darwin` (Intel) or `aarch64-darwin` (Apple Silicon).
 
 </details>
 
@@ -174,7 +172,7 @@ export NIX_PATH=darwin=$HOME/.nix-defexpr/darwin:darwin-config=$HOME/.nixpkgs/da
 cp ~/.nix-defexpr/darwin/modules/examples/simple.nix ~/.nixpkgs/darwin-configuration.nix
 
 # you can also use this to rebootstrap nix-darwin in case
-# darwin-rebuild is to old to activate the system.
+# darwin-rebuild is too old to activate the system.
 $(nix-build '<darwin>' -A system --no-out-link)/sw/bin/darwin-rebuild build
 $(nix-build '<darwin>' -A system --no-out-link)/sw/bin/darwin-rebuild switch
 

default.nix

@@ -16,7 +16,7 @@ let
     };
   };
 
-  # The source code of this repo needed by the [un]installers.
+  # The source code of this repo needed by the installer.
   nix-darwin = lib.cleanSource (
     lib.cleanSourceWith {
       # We explicitly specify a name here otherwise `cleanSource` will use the
@@ -30,5 +30,5 @@ in
 
 eval // {
   installer = pkgs.callPackage ./pkgs/darwin-installer { inherit nix-darwin; };
-  uninstaller = pkgs.callPackage ./pkgs/darwin-uninstaller { inherit nix-darwin; };
+  uninstaller = pkgs.callPackage ./pkgs/darwin-uninstaller { };
 }

doc/known-files/5d23e6d7015756c6f300f8cd558ec4d9234ca61deefd4f2478e91a49760b0747

@@ -0,0 +1,9 @@
+# Generated by https://github.com/DeterminateSystems/nix-installer.
+# See `/nix/nix-installer --version` for the version details.
+
+build-users-group = nixbld
+experimental-features = nix-command flakes repl-flake
+bash-prompt-prefix = (nix:$name)\040
+max-jobs = auto
+extra-nix-path = nixpkgs=flake:nixpkgs
+upgrade-nix-store-path-url = https://install.determinate.systems/nix-upgrade/stable/universal

doc/known-files/97f4135d262ca22d65c9554aad795c10a4491fa61b67d9c2430f4d82bbfec9a2

@@ -0,0 +1,8 @@
+# Generated by https://github.com/DeterminateSystems/nix-installer.
+# See `/nix/nix-installer --version` for the version details.
+
+build-users-group = nixbld
+experimental-features = nix-command flakes repl-flake
+bash-prompt-prefix = (nix:$name)\040
+max-jobs = auto
+extra-nix-path = nixpkgs=flake:nixpkgs

doc/known-files/9d5aa72f807091b481820d12e693093293ba33c73854909ad7b0fb192c2db193

@@ -0,0 +1,11 @@
+# List of acceptable shells for chpass(1).
+# Ftpd will not allow users to connect who are not using
+# one of these shells.
+
+/bin/bash
+/bin/csh
+/bin/dash
+/bin/ksh
+/bin/sh
+/bin/tcsh
+/bin/zsh

doc/known-files/c6080216f2a170611e339c3f46e4e1d61aaf0d8b417ad93ade8d647da1382c11

@@ -0,0 +1,6 @@
+# Generated by https://github.com/DeterminateSystems/nix-installer, version 0.14.0.
+build-users-group = nixbld
+experimental-features = nix-command flakes repl-flake
+bash-prompt-prefix = (nix:$name)\040
+max-jobs = auto
+extra-nix-path = nixpkgs=flake:nixpkgs

doc/known-files/d07015be6875f134976fce84c6c7a77b512079c1c5f9594dfa65c70b7968b65f

@@ -0,0 +1,7 @@
+
+# Set up Nix only on SSH connections
+# See: https://github.com/DeterminateSystems/nix-installer/pull/714
+if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ] && [ -n "${SSH_CONNECTION}" ] && [ "${SHLVL}" -eq 1 ]; then
+    . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'
+fi
+# End Nix

doc/manual/default.nix

@@ -71,7 +71,6 @@ in rec {
       mkdir -p $dst
 
       cp $styles/style.css $dst
-      cp $styles/overrides.css $dst
       cp -r ${pkgs.documentation-highlighter} $dst/highlightjs
 
       substitute ${./manual.md} manual.md \
@@ -86,7 +85,6 @@ in rec {
         --revision ${lib.escapeShellArg revision} \
         --generator "nixos-render-docs ${lib.version}" \
         --stylesheet style.css \
-        --stylesheet overrides.css \
         --stylesheet highlightjs/mono-blue.css \
         --script ./highlightjs/highlight.pack.js \
         --script ./highlightjs/loader.js \

eval-config.nix

@@ -24,6 +24,7 @@ in
 {
   inherit (eval._module.args) pkgs;
   inherit (eval) options config;
+  inherit (eval) _module;
 
   system = eval.config.system.build.toplevel;
 }

flake.nix

@@ -42,7 +42,7 @@
     overlays.default = final: prev: {
       inherit (prev.callPackage ./pkgs/nix-tools { }) darwin-rebuild darwin-option darwin-version;
 
-      darwin-uninstaller = prev.callPackage ./pkgs/darwin-uninstaller { nix-darwin = self; };
+      darwin-uninstaller = prev.callPackage ./pkgs/darwin-uninstaller { };
     };
 
     darwinModules.hydra = ./modules/examples/hydra.nix;

modules/documentation/default.nix

@@ -88,7 +88,7 @@ in
     documentation.enable = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether to install documentation of packages from
         {option}`environment.systemPackages` into the generated system path.
 
@@ -100,7 +100,7 @@ in
     documentation.man.enable = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether to install manual pages and the {command}`man` command.
         This also includes "man" outputs.
       '';
@@ -109,7 +109,7 @@ in
     documentation.info.enable = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether to install info pages and the {command}`info` command.
         This also includes "info" outputs.
       '';
@@ -118,7 +118,7 @@ in
     documentation.doc.enable = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether to install documentation distributed in packages' `/share/doc`.
         Usually plain text and/or HTML.
         This also includes "doc" outputs.

modules/environment/default.nix

@@ -21,7 +21,7 @@ in
       type = types.listOf types.package;
       default = [];
       example = literalExpression "[ pkgs.curl pkgs.vim ]";
-      description = lib.mdDoc ''
+      description = ''
         The set of packages that appear in
         /run/current-system/sw.  These packages are
         automatically available to all users, and are
@@ -34,39 +34,39 @@ in
 
     environment.systemPath = mkOption {
       type = types.listOf (types.either types.path types.str);
-      description = lib.mdDoc "The set of paths that are added to PATH.";
+      description = "The set of paths that are added to PATH.";
       apply = x: if isList x then makeDrvBinPath x else x;
     };
 
     environment.profiles = mkOption {
       type = types.listOf types.str;
-      description = lib.mdDoc "A list of profiles used to setup the global environment.";
+      description = "A list of profiles used to setup the global environment.";
     };
 
     environment.postBuild = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc "Commands to execute when building the global environment.";
+      description = "Commands to execute when building the global environment.";
     };
 
     environment.extraOutputsToInstall = mkOption {
       type = types.listOf types.str;
       default = [];
       example = [ "doc" "info" "devdoc" ];
-      description = lib.mdDoc "List of additional package outputs to be symlinked into {file}`/run/current-system/sw`.";
+      description = "List of additional package outputs to be symlinked into {file}`/run/current-system/sw`.";
     };
 
     environment.pathsToLink = mkOption {
       type = types.listOf types.str;
       default = [];
       example = [ "/share/doc" ];
-      description = lib.mdDoc "List of directories to be symlinked in {file}`/run/current-system/sw`.";
+      description = "List of directories to be symlinked in {file}`/run/current-system/sw`.";
     };
 
     environment.darwinConfig = mkOption {
       type = types.either types.path types.str;
       default = "$HOME/.nixpkgs/darwin-configuration.nix";
-      description = lib.mdDoc ''
+      description = ''
         The path of the darwin configuration.nix used to configure the system,
         this updates the default darwin-config entry in NIX_PATH. Since this
         changes an environment variable it will only apply to new shells.
@@ -79,14 +79,14 @@ in
     environment.loginShell = mkOption {
       type = types.str;
       default = "$SHELL -l";
-      description = lib.mdDoc "Configure default login shell.";
+      description = "Configure default login shell.";
     };
 
     environment.variables = mkOption {
       type = types.attrsOf (types.either types.str (types.listOf types.str));
       default = {};
       example = { EDITOR = "vim"; LANG = "nl_NL.UTF-8"; };
-      description = lib.mdDoc ''
+      description = ''
         A set of environment variables used in the global environment.
         These variables will be set on shell initialisation.
         The value of each variable can be either a string or a list of
@@ -100,7 +100,7 @@ in
       type = types.attrsOf types.str;
       default = {};
       example = { ll = "ls -l"; };
-      description = lib.mdDoc ''
+      description = ''
         An attribute set that maps aliases (the top level attribute names in
         this option) to command strings or directly to build outputs. The
         alises are added to all users' shells.
@@ -110,7 +110,7 @@ in
     environment.extraInit = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Shell script code called during global environment initialisation
         after all variables and profileVariables have been set.
         This code is asumed to be shell-independent, which means you should
@@ -120,7 +120,7 @@ in
 
     environment.shellInit = mkOption {
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Shell script code called during shell initialisation.
         This code is asumed to be shell-independent, which means you should
         stick to pure sh without sh word split.
@@ -130,7 +130,7 @@ in
 
     environment.loginShellInit = mkOption {
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Shell script code called during login shell initialisation.
         This code is asumed to be shell-independent, which means you should
         stick to pure sh without sh word split.
@@ -140,7 +140,7 @@ in
 
     environment.interactiveShellInit = mkOption {
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Shell script code called during interactive shell initialisation.
         This code is asumed to be shell-independent, which means you should
         stick to pure sh without sh word split.