nixpkgs: update

Author: cole-h

morph-network/machines/ofborg-evaluator-0.system.nix

@@ -6,8 +6,6 @@
     }
     )
     ({
-      nixpkgs.config.allowUnfree = true;
-
       boot.initrd.availableKernelModules = [
         "ahci"
         "mpt3sas"

morph-network/machines/ofborg-evaluator-1.system.nix

@@ -6,8 +6,6 @@
     }
     )
     ({
-      nixpkgs.config.allowUnfree = true;
-
       boot.initrd.availableKernelModules = [
         "ahci"
         "mpt3sas"

morph-network/machines/ofborg-evaluator-2.system.nix

@@ -6,8 +6,6 @@
     }
     )
     ({
-      nixpkgs.config.allowUnfree = true;
-
       boot.initrd.availableKernelModules = [
         "ahci"
         "mpt3sas"

morph-network/machines/ofborg-evaluator-3.system.nix

@@ -6,8 +6,6 @@
     }
     )
     ({
-      nixpkgs.config.allowUnfree = true;
-
       boot.initrd.availableKernelModules = [
         "ahci"
         "mpt3sas"

morph-network/machines/ofborg-evaluator-4.system.nix

@@ -6,8 +6,6 @@
     }
     )
     ({
-      nixpkgs.config.allowUnfree = true;
-
       boot.initrd.availableKernelModules = [
         "ahci"
         "mpt3sas"

nix/sources.json

@@ -53,10 +53,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c90c4025bb6e0c4eaf438128a3b2640314b1c58d",
-        "sha256": "12rrrbfcw9p4ykadjjvbbn38fc9xknf7x96yknxfmjvllhfm1fcl",
+        "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64",
+        "sha256": "0zmyrxyrq6l2qjiy4fshjvhza6gvjdq1fn82543wb2li21jmpnpq",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/c90c4025bb6e0c4eaf438128a3b2640314b1c58d.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/4a6b83b05df1a8bd7d99095ec4b4d271f2956b64.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }

nixops/modules/logging/loki.yml

@@ -13,7 +13,6 @@ ingester:
     final_sleep: 0s
   chunk_idle_period: 5m
   chunk_retain_period: 30s
-  max_transfer_retries: 0
 
 schema_config:
   configs:
@@ -33,12 +32,9 @@ storage_config:
     directory: /var/lib/loki/chunks
 
 limits_config:
-  enforce_metric_name: false
   reject_old_samples: true
   reject_old_samples_max_age: 168h
-
-chunk_store_config:
-  max_look_back_period: 0
+  allow_structured_metadata: false
 
 table_manager:
   chunk_tables_provisioning:

nixops/modules/ofborg/default.nix

@@ -56,7 +56,7 @@ in {
   ];
 
   config = {
-    nix.package = pkgs.nixVersions.nix_2_13;
+    nix.package = pkgs.nixVersions.nix_2_18;
     system.stateVersion = "23.05";
 
     age.secrets.rabbitmq_ofborgsrvc_password_file = {

nixops/modules/standard.nix

@@ -12,13 +12,14 @@ in {
   config = {
     nixpkgs = {
       overlays = [ (import ../../nix/overlay.nix) ];
-      config = {
-        allowUnfree = true;
-        packageOverrides = pkgs: {
-        };
-      };
     };
 
+    # NOTE(cole-h): newer nixpkgs didn't like setting `nixpkgs.config.allowUnfree` here, so we
+    # include the hello-unfree package to ensure we're properly allowing unfree
+    environment.systemPackages = [
+      pkgs.hello-unfree
+    ];
+
     services.openssh.enable = true;
     users.users.root.openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMcTaqUZSwv6YW8lx/JhsAZTdNSSC2fR8Pgk8woeFKh vin@scadrial"