bump: mods required for nixpkgs 22.11 and nix 2.12 bump

Author: johnalotoski

flake.lock

@@ -5,17 +5,17 @@
     n2c.follows = "std/n2c";
     data-merge.follows = "std/dmerge";
     # --- Bitte Stack ----------------------------------------------
-    bitte.url = "github:input-output-hk/bitte/equinix";
-    # bitte.url = "path:/home/jlotoski/work/iohk/bitte-wt/equinix";
+    bitte.url = "github:input-output-hk/bitte/equinix-2211";
+    # bitte.url = "path:/home/jlotoski/work/iohk/bitte-wt/equinix-2211";
     # bitte.url = "path:/home/manveru/github/input-output-hk/bitte";
     bitte-cells.url = "github:input-output-hk/bitte-cells/patroni-token-rotation";
     # bitte-cells.url = "path:/home/jlotoski/work/iohk/bitte-cells-wt/bitte-cells";
-    bitte.inputs.nomad-driver-nix.follows = "nomad-driver-nix";
     bitte.inputs.nomad-follower.url = "github:input-output-hk/nomad-follower/3ff1d80324a3a716f008fbfc970a0e836c5b34db";
+    bitte.inputs.capsules.follows = "capsules";
     # --------------------------------------------------------------
     # --- Auxiliary Nixpkgs ----------------------------------------
-    nixpkgs.url = "github:NixOS/nixpkgs";
-    nixpkgs-nix.url = "github:NixOS/nixpkgs";
+    nixpkgs.follows = "bitte/nixpkgs";
+    nix.follows = "bitte/nix";
     capsules = {
       # Until nixago is implemented, as HEAD currently removes fmt hooks
       url = "github:input-output-hk/devshell-capsules/8dcf0e917848abbe58c58fc5d49069c32cd2f585";
@@ -26,16 +26,15 @@
     nix-inclusive.url = "github:input-output-hk/nix-inclusive";
     nixpkgs-postgrest.url = "github:NixOS/nixpkgs/haskell-updates";
     nixpkgs-vector.url = "github:NixOS/nixpkgs/30d3d79b7d3607d56546dd2a6b49e156ba0ec634";
-    nomad-driver-nix.url = "github:input-output-hk/nomad-driver-nix";
     spongix.url = "github:input-output-hk/spongix/extract-gc";
     spongix.inputs.cicero.follows = "cicero";
     spongix-nar-proxy.url = "github:input-output-hk/spongix/nar-proxy";
     spongix-nar-proxy.inputs.cicero.follows = "cicero";
     cicero.url = "github:input-output-hk/cicero";
     cicero.inputs.spongix.follows = "spongix";
-    cicero.inputs.driver.follows = "nomad-driver-nix";
     tullia.url = "github:input-output-hk/tullia";
     openziti.url = "github:johnalotoski/openziti-bins";
+    # openziti.url = "path:/home/jlotoski/work/johnalotoski/openziti-bins-wt/openziti-bins";
     openziti.inputs.nixpkgs.follows = "nixpkgs";
     deploy-rs.url = "github:serokell/deploy-rs";
     # --------------------------------------------------------------

flake.nix

@@ -47,6 +47,15 @@ in {
       capsules.base
       capsules.cloud
     ];
+    commands = let
+      withCategory = category: attrset: attrset // {inherit category;};
+      ciWorld = withCategory "ci-world";
+    in
+      with nixpkgs; [
+        (ciWorld {package = lib.hiPrio bitte.legacyPackages.${system}.consul;})
+        (ciWorld {package = lib.hiPrio bitte.legacyPackages.${system}.nomad;})
+        (ciWorld {package = lib.hiPrio bitte.legacyPackages.${system}.vault-bin;})
+      ];
   };
   ops = dev.mkShell {
     imports = [

nix/automation/devshells.nix

@@ -127,9 +127,7 @@ in
           hostAddress = hostIp;
           localAddress = guestIp;
 
-          config = let
-            inherit (self.inputs.nixpkgs-nix.legacyPackages.x86_64-linux.nixVersions) nix_2_12;
-          in {
+          config = {
             imports = [
               # Common guest level config (also applied at host level)
               ./common.nix
@@ -156,13 +154,12 @@ in
 
             # services.monitoring-exporters.enable = false;
 
+            # Set the state version to the current nixpkgs being used to avoid trace warns
+            system.stateVersion = lib.mkDefault config.system.nixos.release;
+
             # Ensure we can use same nixpkgs with overlays the host uses
             nixpkgs.pkgs = pkgs;
 
-            # Ensure nix package on buildkite matches darwin buildkite at 2.12.0
-            nix.package = nix_2_12;
-            environment.systemPackages = [nix_2_12];
-
             # Don't try to inherit resolved from the equinix host which won't work
             environment.etc."resolv.conf".text = ''
               nameserver 8.8.8.8

nix/metal/bitteProfile/buildkite/buildkite-agent-containers.nix

@@ -24,7 +24,7 @@ in {
     lsof
     ncdu
     sysstat
-    sqliteInteractive
+    sqlite-interactive
     tcpdump
     tig
     tree
@@ -61,35 +61,40 @@ in {
     cron.enable = true;
   };
 
-  nix = lib.mkForce rec {
+  nix = lib.mkForce {
     # Use nix sandboxing for greater determinism
-    useSandbox = true;
+    settings = rec {
+      sandbox = true;
+      sandbox-fallback = false;
 
-    # Make sure we have enough build users
-    nrBuildUsers = 64;
+      max-jobs = "auto";
 
-    # If our cache is down, don't wait forever
-    extraOptions = ''
-      max-jobs = auto
-      connect-timeout = 10
-      http2 = true
-      show-trace = true
-      experimental-features = nix-command flakes
-      allow-import-from-derivation = true
-    '';
+      # Use all cores
+      cores = 0;
 
-    # Use all cores
-    buildCores = 0;
+      # If our cache is down, don't wait forever
+      connect-timeout = 10;
 
-    nixPath = ["nixpkgs=/run/current-system/nixpkgs"];
+      # Use our binary cache builds
+      trusted-substituters = ["https://cache.nixos.org" "https://cache.iog.io"];
+      substituters = trusted-substituters;
+      trusted-public-keys = [
+        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+        "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
+      ];
+
+      system-features = ["kvm" "big-parallel" "nixos-test" "benchmark"];
+
+      http2 = true;
+      show-trace = true;
+      experimental-features = "nix-command flakes";
+      allow-import-from-derivation = true;
+    };
 
-    # Use our binary cache builds
-    trustedBinaryCaches = ["https://cache.nixos.org" "https://cache.iog.io"];
-    binaryCaches = trustedBinaryCaches;
-    binaryCachePublicKeys = [
-      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-      "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
-    ];
+    # Make sure we have enough build users
+    nrBuildUsers = 64;
+
+    nixPath = ["nixpkgs=/run/current-system/nixpkgs"];
   };
 
   system.extraSystemBuilderCmds =

nix/metal/bitteProfile/buildkite/common.nix

@@ -1,11 +1,11 @@
 {lib, ...}: {
-  nix = {
-    # To avoid build problems in containers
-    sandboxPaths = ["/etc/nsswitch.conf" "/etc/protocols"];
+  nix = lib.mkForce {
+    settings = {
+      # To avoid build problems in containers
+      extra-sandbox-paths = ["/etc/nsswitch.conf" "/etc/protocols"];
 
-    # To avoid interactive prompts on flake nix config declarations
-    extraOptions = lib.mkForce ''
-      accept-flake-config = true
-    '';
+      # To avoid interactive prompts on flake nix config declarations
+      accept-flake-config = true;
+    };
   };
 }

nix/metal/bitteProfile/buildkite/nix_nsswitch.nix

@@ -6,5 +6,5 @@
     inputs.bitte.profiles.vault-cache
     inputs.bitte.profiles.auxiliaries-builder
   ];
-  nix.systemFeatures = ["big-parallel"];
+  nix.settings.system-features = ["big-parallel"];
 }

nix/metal/bitteProfile/cache.nix

@@ -506,13 +506,12 @@ in {
           })
         ];
 
-        buildkiteOnly = queue: count: [
+        buildkiteOnly = hostIdSuffix: queue: count: [
           ({
             lib,
             config,
             ...
           }: let
-            inherit (self.inputs.nixpkgs-nix.legacyPackages.x86_64-linux.nixVersions) nix_2_12;
             cfg = config.services.buildkite-containers;
           in {
             # Temporarily disable nomad to avoid conflict with buildkite resource consumption.
@@ -533,6 +532,8 @@ in {
             };
 
             services.buildkite-containers = {
+              inherit hostIdSuffix;
+
               # There should be enough space on these machines to cache dir purges.
               weeklyCachePurge = false;
 
@@ -549,28 +550,24 @@ in {
               in
                 map (n: mkContainer n (toString (10 - n))) (lib.range 1 count);
             };
-
-            # Ensure nix package on buildkite matches darwin buildkite at 2.12.0
-            nix.package = nix_2_12;
-            environment.systemPackages = [nix_2_12];
           })
         ];
 
-        mkEquinixBuildkite = name: privateIP: queue: count: {
+        mkEquinixBuildkite = name: hostIdSuffix: privateIP: queue: count: {
           inherit deployType node_class primaryInterface role privateIP;
           equinix = {inherit plan project;};
 
           modules =
             baseEquinixModuleConfig
             ++ (baseEquinixMachineConfig name)
-            ++ (buildkiteOnly queue count)
+            ++ (buildkiteOnly hostIdSuffix queue count)
             ++ [./buildkite/buildkite-agent-containers.nix];
         };
       in {
-        equinix-1 = mkEquinixBuildkite "equinix-1" "10.12.10.1" "default" 5;
-        equinix-2 = mkEquinixBuildkite "equinix-2" "10.12.10.3" "default" 5;
-        equinix-3 = mkEquinixBuildkite "equinix-3" "10.12.10.5" "benchmark" 1;
-        equinix-4 = mkEquinixBuildkite "equinix-4" "10.12.10.7" "benchmark" 1;
+        equinix-1 = mkEquinixBuildkite "equinix-1" "1" "10.12.10.1" "default" 5;
+        equinix-2 = mkEquinixBuildkite "equinix-2" "2" "10.12.10.3" "default" 5;
+        equinix-3 = mkEquinixBuildkite "equinix-3" "3" "10.12.10.5" "benchmark" 1;
+        equinix-4 = mkEquinixBuildkite "equinix-4" "4" "10.12.10.7" "benchmark" 1;
       };
     };
   };

nix/metal/bitteProfile/default.nix

@@ -27,7 +27,7 @@
           systemd-boot.enable = true;
           efi.canTouchEfiVariables = true;
         };
-        nix.maxJobs = lib.mkDefault 64;
+        nix.settings.max-jobs = lib.mkDefault 64;
       }
     )
     {

nix/metal/bitteProfile/equinix/equinix-1/packet/system.nix

@@ -27,7 +27,7 @@
           systemd-boot.enable = true;
           efi.canTouchEfiVariables = true;
         };
-        nix.maxJobs = lib.mkDefault 64;
+        nix.settings.max-jobs = lib.mkDefault 64;
       }
     )
     {