Merge remote-tracking branch 'upstream/develop' into turn-server

holochain · Mar 20, 2024 · 67c8ce6 · 67c8ce6
2 parents c90b58e + 3082865
commit 67c8ce6
Show file tree

Hide file tree

Showing 22 changed files with 5 additions and 65 deletions.
diff --git a/modules/flake-parts/_template.nix b/modules/flake-parts/_template.nix
@@ -1,16 +1,9 @@
 {
   # System independent arguments.
-  self,
-  lib,
-  inputs,
   ...
 }: {
   perSystem = {
     # Arguments specific to the `perSystem` context.
-    config,
-    self',
-    inputs',
-    pkgs,
     ...
   }: {
     # system specific outputs like, apps, checks, packages

diff --git a/modules/flake-parts/apps.ssh-/default.nix b/modules/flake-parts/apps.ssh-/default.nix
@@ -6,7 +6,6 @@
 }: {
   perSystem = {pkgs, ...}: let
     mkSsh = {
-      attrName,
       hostName,
       deployUser,
     }:

diff --git a/modules/flake-parts/darwinConfigurations.macos-01/default.nix b/modules/flake-parts/darwinConfigurations.macos-01/default.nix
@@ -1,8 +1,6 @@
 {
-  self,
   lib,
   inputs,
-  config,
   ...
 }: let
   system = "aarch64-darwin";

diff --git a/modules/flake-parts/darwinConfigurations.macos-02/default.nix b/modules/flake-parts/darwinConfigurations.macos-02/default.nix
@@ -1,8 +1,6 @@
 {
-  self,
   lib,
   inputs,
-  config,
   ...
 }: let
   system = "x86_64-darwin";

diff --git a/modules/flake-parts/darwinConfigurations.macos-03/default.nix b/modules/flake-parts/darwinConfigurations.macos-03/default.nix
@@ -1,8 +1,6 @@
 {
-  self,
   lib,
   inputs,
-  config,
   ...
 }: let
   system = "aarch64-darwin";

diff --git a/modules/flake-parts/darwinConfigurations.macos-04/default.nix b/modules/flake-parts/darwinConfigurations.macos-04/default.nix
@@ -1,8 +1,6 @@
 {
-  self,
   lib,
   inputs,
-  config,
   ...
 }: let
   system = "aarch64-darwin";

diff --git a/modules/flake-parts/darwinConfigurations.macos-05/default.nix b/modules/flake-parts/darwinConfigurations.macos-05/default.nix
@@ -1,8 +1,6 @@
 {
-  self,
   lib,
   inputs,
-  config,
   ...
 }: let
   system = "aarch64-darwin";

diff --git a/modules/flake-parts/darwinConfigurations.macos-06/default.nix b/modules/flake-parts/darwinConfigurations.macos-06/default.nix
@@ -1,8 +1,6 @@
 {
-  self,
   lib,
   inputs,
-  config,
   ...
 }: let
   system = "x86_64-darwin";

diff --git a/modules/flake-parts/formatter.nix b/modules/flake-parts/formatter.nix
@@ -1,15 +1,5 @@
-{
-  self,
-  lib,
-  ...
-}: {
-  perSystem = {
-    config,
-    self',
-    inputs',
-    pkgs,
-    ...
-  }: {
+{...}: {
+  perSystem = {pkgs, ...}: {
     # define formatter used by `nix fmt`
     formatter = pkgs.alejandra;
   };

diff --git a/modules/flake-parts/microvms.nix-cache/configuration.nix b/modules/flake-parts/microvms.nix-cache/configuration.nix
@@ -1,8 +1,6 @@
 {
   name,
   self,
-  config,
-  lib,
   pkgs,
   ...
 }: let

diff --git a/modules/flake-parts/microvms.nix-cache/default.nix b/modules/flake-parts/microvms.nix-cache/default.nix
@@ -13,12 +13,7 @@ in {
       # Include the microvm module
       inputs.microvm.nixosModules.microvm
       # Add more modules here
-      ({
-        config,
-        lib,
-        pkgs,
-        ...
-      }: {
+      ({config, ...}: {
         microvm.mem = 1024 * 8;
         microvm.vcpu = 4;
 

diff --git a/modules/flake-parts/nixosConfigurations.dweb-reverse-tls-proxy/default.nix b/modules/flake-parts/nixosConfigurations.dweb-reverse-tls-proxy/default.nix
@@ -1,5 +1,4 @@
 {
-  config,
   self,
   lib,
   inputs,

diff --git a/modules/flake-parts/nixosConfigurations.linux-builder-01/configuration.nix b/modules/flake-parts/nixosConfigurations.linux-builder-01/configuration.nix
@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   inputs,
   self,
   pkgs,

diff --git a/modules/flake-parts/nixosConfigurations.linux-builder-01/default.nix b/modules/flake-parts/nixosConfigurations.linux-builder-01/default.nix
@@ -1,5 +1,4 @@
 {
-  config,
   self,
   lib,
   inputs,

diff --git a/modules/flake-parts/packages.default.nix b/modules/flake-parts/packages.default.nix
@@ -1,18 +1,10 @@
 {
   # System independent arguments.
-  self,
-  lib,
-  inputs,
-  inputs',
   ...
 }: {
   perSystem = {
     # Arguments specific to the `perSystem` context.
-    config,
-    self',
-    inputs',
     pkgs,
-    system,
     ...
   }: {
     # system specific outputs like, apps, checks, packages

diff --git a/modules/nixos/cachix-watch.nix b/modules/nixos/cachix-watch.nix
@@ -1,8 +1,6 @@
 {
   inputs,
   pkgs,
-  config,
-  lib,
   magicPaths,
   ...
 }: {

diff --git a/modules/nixos/github-runner-multi-arch.nix b/modules/nixos/github-runner-multi-arch.nix
@@ -2,7 +2,6 @@
   self,
   config,
   lib,
-  magicPaths,
   pkgs,
   ...
 }: let

diff --git a/modules/nixos/holo-deploy.nix b/modules/nixos/holo-deploy.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: {
+{lib, ...}: {
   options = {
     deployUser = lib.mkOption {
       type = lib.types.str;

diff --git a/modules/nixos/macos-remote-builder.nix b/modules/nixos/macos-remote-builder.nix
@@ -1,5 +1,4 @@
 {
-  config,
   lib,
   pkgs,
   ...

diff --git a/modules/nixos/macos.nix b/modules/nixos/macos.nix
@@ -1,7 +1,6 @@
 {
   inputs,
   config,
-  pkgs,
   lib,
   ...
 }: {

diff --git a/modules/nixos/shared-nix-settings.nix b/modules/nixos/shared-nix-settings.nix
@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   lib,
   ...

diff --git a/modules/nixos/shared.nix b/modules/nixos/shared.nix
@@ -2,10 +2,8 @@
   config,
   pkgs,
   lib,
-  system,
   ...
-}: let
-in {
+}: {
   # Nix configuration shared between all hosts
 
   imports =