Unverified Commit 40c95f55 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents b9c3be09 e6c8eff6
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@
                        nixpkgs.hostPlatform = "x86_64-linux";
                        boot.loader.grub.enable = false;
                        fileSystems."/".device = "nodev";
                        fileSystems."/".fsType = "none";
                        # See https://search.nixos.org/options?show=system.stateVersion&query=stateversion
                        system.stateVersion = lib.trivial.release; # DON'T do this in real configs!
                      }
+0 −7
Original line number Diff line number Diff line
@@ -29514,13 +29514,6 @@
    github = "xdHampus";
    githubId = 16954508;
  };
  xe = {
    email = "me@christine.website";
    matrix = "@withoutwithin:matrix.org";
    github = "Xe";
    githubId = 529003;
    name = "Christine Dodrill";
  };
  xeals = {
    email = "dev@xeal.me";
    github = "xeals";
+2 −0
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@

- The packages `iw` and `wirelesstools` (`iwconfig`, `iwlist`, etc.) are no longer installed implicitly if wireless networking has been enabled.

- The `fileSystems.<name>.fsType` option no longer has a default value and must be specified by the user. The value `"auto"` still works as before, though its use is generally discouraged.

- `services.uptime` has been removed because the package it relies on does not exist anymore in nixpkgs.

- `services.kubernetes.addons.dns.coredns` has been renamed to `services.kubernetes.addons.dns.corednsImage` and now expects a
+1 −0
Original line number Diff line number Diff line
@@ -796,6 +796,7 @@ in
          "/dev/disk/by-label/${config.isoImage.volumeID}"
        else
          "/dev/root";
      fsType = "iso9660";
      neededForBoot = true;
      noCheck = true;
    };
+4 −7
Original line number Diff line number Diff line
@@ -160,17 +160,14 @@ in
      serviceConfig = {
        Type = "notify";
        ExecStart = "${cmd} start";
        ExecStop = "${cmd} stop";
        ExecStop = [
          "${cmd} stop"
          "${lib.getExe' pkgs.util-linux "waitpid"} -t 30 -e $MAINPID"
        ];
        Restart = "always";
        TimeoutSec = "5min";
        User = "unifi";
        UMask = "0077";
        WorkingDirectory = "${stateDir}";
        # the stop command exits while the main process is still running, and unifi
        # wants to manage its own child processes. this means we have to set KillSignal
        # to something the main process ignores, otherwise every stop will have unifi.service
        # fail with SIGTERM status.
        KillSignal = "SIGCONT";

        # Hardening
        AmbientCapabilities = "";
Loading