Move from naersk to buildRustPackage

DanNixon · Aug 14, 2024 · d3d09fe · d3d09fe
1 parent 3e0a030
commit d3d09fe
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 61 deletions.
diff --git a/agent/default.nix b/agent/default.nix
@@ -1,28 +1,32 @@
 {
   pkgs,
-  naersk',
+  rustPlatform,
   version,
   gitRevision,
   buildInputs,
   nativeBuildInputs,
 }: rec {
-  satori-agent = naersk'.buildPackage {
-    name = "satori-agent";
+  satori-agent = rustPlatform.buildRustPackage {
+    pname = "satori-agent";
     version = version;
 
     src = ./..;
-    cargoBuildOptions = x: x ++ ["--package" "satori-agent"];
+    cargoLock.lockFile = ../Cargo.lock;
 
     nativeBuildInputs = nativeBuildInputs ++ [pkgs.makeWrapper];
     buildInputs = buildInputs;
 
+    cargoBuildFlags = ["--package satori-agent"];
+
+    GIT_REVISION = gitRevision;
+
     # Ensure ffmpeg binary is available
     postInstall = ''
       wrapProgram $out/bin/satori-agent --prefix PATH : ${pkgs.lib.makeBinPath [pkgs.ffmpeg]}
     '';
-    overrideMain = p: {
-      GIT_REVISION = gitRevision;
-    };
+
+    # No need to do tests here, testing should have already been done earlier in CI pipeline
+    doCheck = false;
   };
 
   satori-agent-container-image = let

diff --git a/archiver/default.nix b/archiver/default.nix
@@ -1,24 +1,27 @@
 {
   pkgs,
-  naersk',
+  rustPlatform,
   version,
   gitRevision,
   buildInputs,
   nativeBuildInputs,
 }: rec {
-  satori-archiver = naersk'.buildPackage {
-    name = "satori-archiver";
+  satori-archiver = rustPlatform.buildRustPackage {
+    pname = "satori-archiver";
     version = version;
 
     src = ./..;
-    cargoBuildOptions = x: x ++ ["--package" "satori-archiver"];
+    cargoLock.lockFile = ../Cargo.lock;
 
     nativeBuildInputs = nativeBuildInputs;
     buildInputs = buildInputs;
 
-    overrideMain = p: {
-      GIT_REVISION = gitRevision;
-    };
+    cargoBuildFlags = ["--package satori-archiver"];
+
+    GIT_REVISION = gitRevision;
+
+    # No need to do tests here, testing should have already been done earlier in CI pipeline
+    doCheck = false;
   };
 
   satori-archiver-container-image = pkgs.dockerTools.buildImage {

diff --git a/ctl/default.nix b/ctl/default.nix
@@ -1,24 +1,27 @@
 {
   pkgs,
-  naersk',
+  rustPlatform,
   version,
   gitRevision,
   buildInputs,
   nativeBuildInputs,
 }: rec {
-  satorictl = naersk'.buildPackage {
-    name = "satorictl";
+  satorictl = rustPlatform.buildRustPackage {
+    pname = "satorictl";
     version = version;
 
     src = ./..;
-    cargoBuildOptions = x: x ++ ["--package" "satorictl"];
+    cargoLock.lockFile = ../Cargo.lock;
 
     nativeBuildInputs = nativeBuildInputs;
     buildInputs = buildInputs;
 
-    overrideMain = p: {
-      GIT_REVISION = gitRevision;
-    };
+    cargoBuildFlags = ["--package satorictl"];
+
+    GIT_REVISION = gitRevision;
+
+    # No need to do tests here, testing should have already been done earlier in CI pipeline
+    doCheck = false;
   };
 
   satorictl-container-image = pkgs.dockerTools.buildImage {

diff --git a/event-processor/default.nix b/event-processor/default.nix
@@ -1,24 +1,27 @@
 {
   pkgs,
-  naersk',
+  rustPlatform,
   version,
   gitRevision,
   buildInputs,
   nativeBuildInputs,
 }: rec {
-  satori-event-processor = naersk'.buildPackage {
-    name = "satori-event-processor";
+  satori-event-processor = rustPlatform.buildRustPackage {
+    pname = "satori-event-processor";
     version = version;
 
     src = ./..;
-    cargoBuildOptions = x: x ++ ["--package" "satori-event-processor"];
+    cargoLock.lockFile = ../Cargo.lock;
 
     nativeBuildInputs = nativeBuildInputs;
     buildInputs = buildInputs;
 
-    overrideMain = p: {
-      GIT_REVISION = gitRevision;
-    };
+    cargoBuildFlags = ["--package satori-event-processor"];
+
+    GIT_REVISION = gitRevision;
+
+    # No need to do tests here, testing should have already been done earlier in CI pipeline
+    doCheck = false;
   };
 
   satori-event-processor-container-image = pkgs.dockerTools.buildImage {

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,28 +1,21 @@
 {
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
-
     flake-utils.url = "github:numtide/flake-utils";
-
-    naersk = {
-      url = "github:nix-community/naersk";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs = {
     self,
     nixpkgs,
     flake-utils,
-    naersk,
   }:
     flake-utils.lib.eachDefaultSystem (
       system: let
         pkgs = (import nixpkgs) {
           inherit system;
         };
 
-        naersk' = pkgs.callPackage naersk {
+        rustPlatform = pkgs.makeRustPlatform {
           cargo = pkgs.cargo;
           rustc = pkgs.rustc;
         };
@@ -67,10 +60,10 @@
         };
 
         packages =
-          import ./agent {inherit pkgs naersk' version gitRevision nativeBuildInputs buildInputs;}
-          // import ./archiver {inherit pkgs naersk' version gitRevision nativeBuildInputs buildInputs;}
-          // import ./ctl {inherit pkgs naersk' version gitRevision nativeBuildInputs buildInputs;}
-          // import ./event-processor {inherit pkgs naersk' version gitRevision nativeBuildInputs buildInputs;};
+          import ./agent {inherit pkgs rustPlatform version gitRevision nativeBuildInputs buildInputs;}
+          // import ./archiver {inherit pkgs rustPlatform version gitRevision nativeBuildInputs buildInputs;}
+          // import ./ctl {inherit pkgs rustPlatform version gitRevision nativeBuildInputs buildInputs;}
+          // import ./event-processor {inherit pkgs rustPlatform version gitRevision nativeBuildInputs buildInputs;};
       }
     );
 }