Merge pull request #163 from ralexstokes/nixos-module

Nixos module

flake.nix

@@ -3,13 +3,9 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-      };
+      inputs.nixpkgs.follows = "nixpkgs";
     };
     crane = {
       url = "github:ipetkov/crane";
@@ -18,20 +14,27 @@
   };
 
   outputs = { self, flake-utils, nixpkgs, rust-overlay, crane }:
-    flake-utils.lib.eachDefaultSystem
-      (system:
+    let
+      overlays = [ (import rust-overlay) ];
+      mev-rs = system:
         let
-          overlays = [ (import rust-overlay) ];
           pkgs = import nixpkgs { inherit system overlays; };
           rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
           craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain;
-          mev = pkgs.callPackage ./nix/mev.nix { inherit pkgs; crane = craneLib; };
         in
-        {
-          devShells.default = import ./shell.nix { inherit pkgs; };
-          overlays.default = _: _: {
-            inherit mev;
-          };
-          packages.mev = mev;
-        });
+        pkgs.callPackage ./nix/mev-rs.nix { inherit pkgs; crane = craneLib; };
+    in
+    {
+      nixosModules.mev-rs = import ./nix/module.nix { inherit mev-rs; };
+      nixosModules.default = self.nixosModules.mev-rs;
+
+      packages.x86_64-darwin.mev-rs = mev-rs "x86_64-darwin";
+      packages.x86_64-darwin.default = self.packages.x86_64-darwin.mev-rs;
+
+      packages.aarch64-darwin.mev-rs = mev-rs "aarch64-darwin";
+      packages.aarch64-darwin.default = self.packages.aarch64-darwin.mev-rs;
+
+      packages.x86_64-linux.mev-rs = mev-rs "x86_64-linux";
+      packages.x86_64-linux.default = self.packages.x86_64-linux.mev-rs;
+    };
 }

nix/mev.nix → nix/mev-rs.nix

@@ -7,7 +7,8 @@ let
     buildInputs = lib.optionals pkgs.stdenv.isLinux [
       openssl
     ] ++ lib.optionals pkgs.stdenv.isDarwin [
-      darwin.apple_sdk.frameworks.Network
+      darwin.apple_sdk.frameworks.CFNetwork
+      darwin.apple_sdk.frameworks.SystemConfiguration
     ];
     nativeBuildInputs = lib.optionals pkgs.stdenv.isLinux [
       clang

nix/module.nix

@@ -0,0 +1,47 @@
+pkg:
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.services.mev-rs;
+
+  mev-rs = pkg.mev-rs pkgs.system;
+
+  name = "mev-${cfg.enable}-rs";
+
+  cmd = ''
+    ${mev-rs}/bin/mev \
+    ${cfg.enable} \
+    ${cfg.config-file}
+  '';
+in
+{
+  options.services.mev-rs = {
+    enable = lib.mkOption {
+      type = lib.types.enum [ "boost" "build" ];
+      description = "which subcommand of `mev-rs` to run";
+    };
+    config-file = lib.mkOption {
+      type = lib.types.str;
+      description = ''
+        path to a config file suitable for the `mev-rs` toolkit
+      '';
+    };
+  };
+
+  config = {
+    environment.systemPackages = [
+      mev-rs
+    ];
+
+    systemd.services."${name}" = {
+      description = name;
+      wantedBy = [ "multi-user.target" ];
+      after = [ "vc.service" ];
+      serviceConfig = {
+        ExecStart = cmd;
+        Restart = "on-failure";
+        RestartSec = "10s";
+        SyslogIdentifier = name;
+      };
+    };
+  };
+}

shell.nix

@@ -5,7 +5,7 @@ mkShell {
     openssl
   ] ++ lib.optionals pkgs.stdenv.isDarwin [
     libiconv
-    darwin.apple_sdk.frameworks.Network
+    darwin.apple_sdk.frameworks.CFNetwork
   ] ++ [
     just
     mdbook