Upgrade to 23.11 (#17)

.github/workflows/validate.yml

@@ -19,7 +19,7 @@ jobs:
     - uses: cachix/install-nix-action@v22
       with:
         extra_nix_config: "system-features = nixos-test benchmark big-parallel kvm"
-        nix_path: nixpkgs=channel:nixos-23.05
+        nix_path: nixpkgs=channel:nixos-23.11
 
     - name: build
       run: NIXPKGS_ALLOW_UNFREE=1 nix build --impure

README.md

@@ -4,7 +4,7 @@ Packages [kolide/launcher](https://github.com/kolide/launcher) for Nix.
 
 ## Developing and testing in a VM
 
-Create a VM using a NixOS 23.05 image with flakes enabled and SSH to the new VM.
+Create a VM using a NixOS 23.11 image with flakes enabled and SSH to the new VM.
 
 Make a directory for the launcher flake and copy your changes to `flake.nix` and `flake.lock` into it.
 Make the subdirectory `modules/kolide-launcher` and copy your changes to `default.nix` into it.

flake.nix

@@ -1,7 +1,7 @@
 {
   description = "Kolide launcher";
 
-  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
 
   outputs = { self, nixpkgs }: {
     packages.x86_64-linux.kolide-launcher =

modules/kolide-launcher/default.nix

@@ -46,6 +46,22 @@ in
         itself and its osquery installation: one of stable, nightly, beta, or alpha.
       '';
     };
+
+    autoupdateInterval = mkOption {
+      type = types.str;
+      default = "1h";
+      description = ''
+        The interval to check for launcher and osqueryd updates.
+      '';
+    };
+
+    autoupdaterInitialDelay = mkOption {
+      type = types.str;
+      default = "1h";
+      description = ''
+        Initial autoupdater subprocess delay.
+      '';
+    };
   };
 
   config = mkIf cfg.enable {
@@ -71,7 +87,9 @@ in
             --enroll_secret_path ${cfg.enrollSecretDirectory}/secret \
             --update_channel ${cfg.updateChannel} \
             --transport jsonrpc \
-            --autoupdate
+            --autoupdate \
+            --autoupdate_interval ${cfg.autoupdateInterval} \
+            --autoupdater_initial_delay ${cfg.autoupdaterInitialDelay}
         '';
         Restart = "on-failure";
         RestartSec = 3;

tests/kolide-launcher.nix

@@ -2,8 +2,8 @@
 
 let
   nixpkgs = builtins.fetchTarball {
-    url = "https://github.com/nixOS/nixpkgs/archive/23.05.tar.gz";
-    sha256 = "sha256:10wn0l08j9lgqcw8177nh2ljrnxdrpri7bp0g7nvrsn9rkawvlbf"; 
+    url = "https://github.com/nixOS/nixpkgs/archive/23.11.tar.gz";
+    sha256 = "sha256:1ndiv385w1qyb3b18vw13991fzb9wg4cl21wglk89grsfsnra41k";
   };
   pkgs = import nixpkgs { config = {}; overlays = []; };
 in
@@ -37,7 +37,7 @@ pkgs.nixosTest {
     hardware.pulseaudio.enable = true;
 
     services.kolide-launcher.enable = true;
-    system.stateVersion = "23.05";
+    system.stateVersion = "23.11";
   };
 
   testScript = { nodes, ... }: