Nixinate was causing more trouble than it saved

cardano-scaling · Nov 18, 2024 · 65f7dc6 · 65f7dc6
1 parent 6ab48f2
commit 65f7dc6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 68 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ This is the system image repository for the hydra-explorer service.
 ## Deployment
 
 ```sh
-nix run .#apps.x86_64-linux.nixinate.hydra-explorer
+nixos-rebuild switch --target-host [email protected] --flake .#hydra-explorer --use-remote-sudo
 ```
 
 ## Testing locally

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -34,8 +34,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nixinate.url = "github:MatthewCroughan/nixinate";
-
     nix-npm-buildpackage.url = "github:serokell/nix-npm-buildpackage";
 
     nixpkgs.follows = "haskell-nix/nixpkgs";
@@ -68,7 +66,23 @@
 
       flake = _: {
         nixosConfigurations.hydra-explorer =
-          import ./nix/hydra-explorer-aws.nix { inherit inputs; };
+          inputs.nixpkgs.lib.nixosSystem
+          {
+            system = "x86_64-linux";
+            specialArgs = inputs;
+            modules = [
+              {
+                imports = [
+                  "${inputs.nixpkgs}/nixos/modules/virtualisation/amazon-image.nix"
+                  (import ./nix/hydra-explorer-configuration.nix {
+                    cardano-node-module = inputs.cardano-node.nixosModules.cardano-node;
+                    hydra-explorer = inputs.self.packages.x86_64-linux.hydra-explorer;
+                    hydra-explorer-web = inputs.self.packages.x86_64-linux.hydra-explorer-web;
+                  })
+                ];
+              }
+            ];
+          };
       };
 
       outputs = import ./nix/outputs.nix;

diff --git a/nix/hydra-explorer-aws.nix b/nix/hydra-explorer-aws.nix
diff --git a/nix/outputs.nix b/nix/outputs.nix
@@ -5,8 +5,6 @@ let
 in
 [
   {
-    apps = inputs.nixinate.nixinate."x86_64-linux" inputs.self;
-
     packages.hydra-explorer-web = import ../hydra-explorer/web/hydra-explorer.nix { inherit pkgs; };
 
     # A place to hack on the image to see how it works.
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,8 +5,6 @@ let @@
     in
     [
       {
-        apps = inputs.nixinate.nixinate."x86_64-linux" inputs.self;
         packages.hydra-explorer-web = import ../hydra-explorer/web/hydra-explorer.nix { inherit pkgs; };
         # A place to hack on the image to see how it works.
@@ Expand Down @@