Update packages.

nix/configuration/configuration.nix

@@ -246,31 +246,8 @@ in
             glew = (final.glew.override { enableEGL = false; });
           };
         })
-        (final: prev: {
-          fwupd = prev.fwupd.overrideAttrs (
-            finalAttrs: prevAttrs: {
-              version = "2.1.5";
-              src = final.fetchFromGitHub {
-                owner = "fwupd";
-                repo = "fwupd";
-                tag = finalAttrs.version;
-                hash = "sha256-DzQ+N99ZmFRqZc2rN6PSqmoIMXUyrE8Kkn+KnT/AWPc=";
-              };
-            }
-          );
-        })
         (disableTests "onetbb") # oneTBB tests hang forever on machines with a single core (like my build virtual machine) https://github.com/uxlfoundation/oneTBB/issues/1557
         (disableTests "aws-c-common") # aws-c-common tests time out on my build virtual machine but run fine on my laptop.
-
-        # Works but probably sets python2's scipy to be python3:
-        #
-        # (final: prev: {
-        #   pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
-        #     (python-final: python-prev: {
-        #       scipy = final.unoptimized.python3Packages.scipy;
-        #     })
-        #   ];
-        # })
       ];
 
     # This option defines the first version of NixOS you have installed on this particular machine,

nix/configuration/flake.lock

@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780894562,
+        "lastModified": 1781152676,
-        "narHash": "sha256-c3430xwxwhHipl3jigUGMMBfpaMylDqytW/kdmB3ZGs=",
+        "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "24fed06cac83bcc44ac8efbb57cab1a82fa0bedc",
+        "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1",
         "type": "github"
       },
       "original": {
@@ -170,11 +170,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1785893798,
+        "lastModified": 1785248363,
-        "narHash": "sha256-69nKdvM+E/66sj9R2HEK8i0p0TOt/0MSqfXiZjcJ9nI=",
+        "narHash": "sha256-hx9Cn1vIa/h54t+s3ObO6+Z3xHSA1zc3YVRWxTZcigc=",
         "ref": "refs/heads/main",
-        "rev": "6386febdb81eb1e072ad7cb568019f06618008fe",
+        "rev": "0addf91edf82775a0dc5022a81065ef101305e64",
-        "revCount": 41,
+        "revCount": 38,
         "type": "git",
         "url": "https://code.fizz.buzz/talexander/nix_builder.git"
       },
@@ -185,11 +185,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1780749050,
+        "lastModified": 1785090369,
-        "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
+        "narHash": "sha256-m0pDuRJG7EDo9ri+4Ksu83VsI+PlxNC9lNBfydejce4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
+        "rev": "624af665418d3c65d544145b4d34ad696439570e",
         "type": "github"
       },
       "original": {
@@ -199,22 +199,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-google": {
-      "locked": {
-        "lastModified": 1779893571,
-        "narHash": "sha256-wiwMyVCtmjRjlFCe2zaumCE6LRV9GzzN0ZH25NQkbAU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "45f6cfaa4605b706c870e75bd74bdb5e97eee11e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "45f6cfaa4605b706c870e75bd74bdb5e97eee11e",
-        "type": "github"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1730741070,
@@ -264,8 +248,7 @@
         "impermanence": "impermanence",
         "lanzaboote": "lanzaboote",
         "nix_builder": "nix_builder",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs"
-        "nixpkgs-google": "nixpkgs-google"
       }
     },
     "rust-overlay": {

nix/configuration/flake.nix

@@ -20,7 +20,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-google.url = "github:NixOS/nixpkgs/45f6cfaa4605b706c870e75bd74bdb5e97eee11e";
     lanzaboote = {
       url = "github:nix-community/lanzaboote/v0.4.2";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -39,7 +38,6 @@
     {
       self,
       nixpkgs,
-      nixpkgs-google,
       disko,
       impermanence,
       lanzaboote,
@@ -99,9 +97,6 @@
                       hostPlatform.gcc.arch = "default";
                       hostPlatform.gcc.tune = "default";
                     };
-                    google = import nixpkgs-google {
-                      system = prev.stdenv.hostPlatform.system;
-                    };
                   })
                 ];
               };

nix/configuration/hosts/family_disks/distributed_build.nix

@@ -4,15 +4,13 @@
   config = {
     me.distributed_build.enable = true;
     me.distributed_build.machines.quark = {
-      enable_build = false;
+      enable = false;
-      enable_substituter = false;
       additional_config = {
         speedFactor = 2;
       };
     };
     me.distributed_build.machines.hydra = {
-      enable_build = false;
+      enable = true;
-      enable_substituter = true;
       additional_config = {
         speedFactor = 2;
       };

nix/configuration/hosts/i_only_boot_zfs/distributed_build.nix

@@ -4,19 +4,10 @@
   config = {
     me.distributed_build.enable = true;
     me.distributed_build.machines.quark = {
-      enable_build = false;
+      enable = true;
-      enable_substituter = false;
       additional_config = {
         speedFactor = 2;
       };
     };
-    me.distributed_build.machines.hydra = {
-      enable_build = false;
-      enable_substituter = true;
-      additional_config = {
-        speedFactor = 2;
-      };
-      substituter_url = "ssh-ng://nixworker@ns1.fizz.buzz:65122?compress=true&ssh-key=/persist/manual/ssh/root/keys/id_ed25519&remote-store=local?root=/.disk/root";
-    };
   };
 }

nix/configuration/hosts/odo/distributed_build.nix

@@ -4,15 +4,13 @@
   config = {
     me.distributed_build.enable = true;
     me.distributed_build.machines.quark = {
-      enable_build = false;
+      enable = false;
-      enable_substituter = false;
       additional_config = {
         speedFactor = 2;
       };
     };
     me.distributed_build.machines.hydra = {
-      enable_build = false;
+      enable = true;
-      enable_substituter = true;
       additional_config = {
         speedFactor = 2;
       };

nix/configuration/hosts/odowork/distributed_build.nix

@@ -4,15 +4,13 @@
   config = {
     me.distributed_build.enable = true;
     me.distributed_build.machines.quark = {
-      enable_build = false;
+      enable = false;
-      enable_substituter = false;
       additional_config = {
         speedFactor = 2;
       };
     };
     me.distributed_build.machines.hydra = {
-      enable_build = false;
+      enable = true;
-      enable_substituter = true;
       additional_config = {
         speedFactor = 2;
       };

nix/configuration/hosts/quark/distributed_build.nix

@@ -3,16 +3,8 @@
 
   config = {
     me.distributed_build.enable = true;
-    me.distributed_build.machines.quark = {
-      enable_build = false;
-      enable_substituter = false;
-      additional_config = {
-        speedFactor = 2;
-      };
-    };
     me.distributed_build.machines.hydra = {
-      enable_build = false;
+      enable = true;
-      enable_substituter = true;
       additional_config = {
         speedFactor = 2;
       };

nix/configuration/hosts/recovery/distributed_build.nix

@@ -4,19 +4,10 @@
   config = {
     me.distributed_build.enable = true;
     me.distributed_build.machines.quark = {
-      enable_build = false;
+      enable = true;
-      enable_substituter = false;
       additional_config = {
         speedFactor = 2;
       };
     };
-    me.distributed_build.machines.hydra = {
-      enable_build = false;
-      enable_substituter = true;
-      additional_config = {
-        speedFactor = 2;
-      };
-      substituter_url = "ssh-ng://nixworker@ns1.fizz.buzz:65122?compress=true&ssh-key=/persist/manual/ssh/root/keys/id_ed25519&remote-store=local?root=/.disk/root";
-    };
   };
 }

nix/configuration/roles/distributed_build/default.nix

@@ -10,14 +10,7 @@
 
 let
   make_machine_config = name: {
-    enable_build = lib.mkOption {
+    enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to use the ${name} machine during distributed builds.";
-    };
-
-    enable_substituter = lib.mkOption {
       type = lib.types.bool;
       default = false;
       example = true;
@@ -66,30 +59,11 @@ let
       hostName = lib.mkForce "hydra?remote-store=local?root=/.disk/root";
     };
   };
-  build_machine_list = (
-    map (
-      hostname:
-      (lib.mkIf config.me.distributed_build.machines."${hostname}".enable_build (
-        lib.mkMerge [
-          {
-            hostName = hostname;
-            sshUser = "nixworker";
-            sshKey = "/persist/manual/ssh/root/keys/id_ed25519";
-            maxJobs = 1;
-            supportedFeatures = all_nixos_configs."${hostname}".config.me.optimizations.system_features;
-            protocol = "ssh-ng";
-          }
-          static_host_configs."${hostname}"
-          config.me.distributed_build.machines."${hostname}".additional_config
-        ]
-      ))
-    ) (builtins.attrNames all_nixos_configs)
-  );
   substituters_list = (
     map (
       hostname:
       (lib.mkIf (
-        config.me.distributed_build.machines."${hostname}".enable_substituter
+        config.me.distributed_build.machines."${hostname}".enable
         && config.me.distributed_build.machines."${hostname}".substituter_url != null
       ) (config.me.distributed_build.machines."${hostname}".substituter_url))
     ) (builtins.attrNames all_nixos_configs)
@@ -138,7 +112,25 @@ in
         ];
       }
       {
-        nix.buildMachines = build_machine_list;
+        nix.buildMachines = (
+          map (
+            hostname:
+            (lib.mkIf config.me.distributed_build.machines."${hostname}".enable (
+              lib.mkMerge [
+                {
+                  hostName = hostname;
+                  sshUser = "nixworker";
+                  sshKey = "/persist/manual/ssh/root/keys/id_ed25519";
+                  maxJobs = 1;
+                  supportedFeatures = all_nixos_configs."${hostname}".config.me.optimizations.system_features;
+                  protocol = "ssh-ng";
+                }
+                static_host_configs."${hostname}"
+                config.me.distributed_build.machines."${hostname}".additional_config
+              ]
+            ))
+          ) (builtins.attrNames all_nixos_configs)
+        );
       }
       (lib.mkIf has_any_substituters {
         nix.settings.substitute = lib.mkForce true;

nix/configuration/roles/gcloud/default.nix

@@ -18,7 +18,7 @@
   };
 
   config = lib.mkIf config.me.gcloud.enable {
-    environment.systemPackages = with pkgs.google; [
+    environment.systemPackages = with pkgs; [
       (google-cloud-sdk.withExtraComponents [ google-cloud-sdk.components.gke-gcloud-auth-plugin ])
     ];
 

nix/configuration/roles/latex/default.nix

@@ -25,8 +25,8 @@
     nixpkgs.overlays = [
       (final: prev: {
         tex = (
-          pkgs.texlive.combine {
+          pkgs.texliveSmall.withPackages (
-            inherit (pkgs.texlive)
+            ps: with ps; [
               scheme-basic
               dvisvgm
               dvipng # for preview and export as html in org-mode
@@ -44,8 +44,8 @@
               upquote # emacs org-mode pdf export
               lineno # emacs org-mode pdf export
               beamer # emacs org-mode presentation pdf export
-              ;
+            ]
-          }
+          )
         );
       })
     ];