Skip to content

Commit

Permalink
Merge pull request #120 from holochain/chore-fmt
Browse files Browse the repository at this point in the history
chore: nix fmt
  • Loading branch information
steveej authored Jun 13, 2024
2 parents 2da8aed + ebf462e commit 76734c2
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 18 deletions.
14 changes: 6 additions & 8 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,7 @@

tx5.url = "github:holochain/tx5/tx5-signal-srv-v0.0.8-alpha";
tx5.flake = false;
sbd.url =
"github:holochain/sbd/sbd-server-v0.0.4-alpha"
;
sbd.url = "github:holochain/sbd/sbd-server-v0.0.4-alpha";
sbd.flake = false;

holochain-versions.url = "github:holochain/holochain?dir=versions/weekly";
Expand Down Expand Up @@ -147,7 +145,6 @@
nomadCaCert = ./secrets/nomad/admin/nomad-agent-ca.pem;
nomadClientCert = ./secrets/nomad/cli/global-cli-nomad.pem;


pkgsUnstable = inputs'.nixpkgsUnstable.legacyPackages;
pkgsPulumi = inputs'.nixpkgsPulumi.legacyPackages;
in
Expand Down Expand Up @@ -193,10 +190,11 @@

pkgs.jq
pkgsPulumi.pulumictl
(pkgsPulumi.pulumi.withPackages(pulumiPackages: with pulumiPackages; [
pulumi-language-go
pulumi-command
]))
(pkgsPulumi.pulumi.withPackages (pulumiPackages:
with pulumiPackages; [
pulumi-language-go
pulumi-command
]))
pkgs.go_1_21
]
++ (
Expand Down
8 changes: 3 additions & 5 deletions modules/flake-parts/apps.deploy-/linux.nix
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
ssh root@${hostName} "$closure_path/bin/switch-to-configuration ''${1:-switch}"
'';


mkLinuxDeployDirectApp = attrName: config:
lib.nameValuePair "deploy-direct-${attrName}" {
type = "app";
Expand All @@ -62,9 +61,8 @@
};
in {
config.apps =
(lib.mapAttrs' mkLinuxDeployApp self.nixosConfigurations) //
(lib.mapAttrs' mkLinuxDeployDirectApp self.nixosConfigurations) //
{}
;
(lib.mapAttrs' mkLinuxDeployApp self.nixosConfigurations)
// (lib.mapAttrs' mkLinuxDeployDirectApp self.nixosConfigurations)
// {};
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
}: let
hostName = "tfgrid-devnet-vm0";
in {

imports = [
../nixosConfigurations.tfgrid-base/configuration.nix

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
}: let
hostName = "tfgrid-hpos-base";
in {

imports = [
../nixosConfigurations.tfgrid-base/configuration.nix

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
flake.nixosConfigurations.tfgrid-hpos-base = inputs.nixpkgs.lib.nixosSystem {
modules = [
./configuration.nix
];
];
system = "x86_64-linux";
specialArgs = self.specialArgs;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
}: let
hostName = "tfgrid-hpos-base";
in {

imports = [
../nixosConfigurations.tfgrid-hpos-base/configuration.nix

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
flake.nixosConfigurations.tfgrid-hpos = inputs.nixpkgs.lib.nixosSystem {
modules = [
./configuration.nix
];
];
system = "x86_64-linux";
specialArgs = self.specialArgs;
};
Expand Down

0 comments on commit 76734c2

Please sign in to comment.