diff --git a/all-packages.nix b/all-packages.nix
index 22de29bc..50788e88 100644
--- a/all-packages.nix
+++ b/all-packages.nix
@@ -6,6 +6,7 @@
   self = let
     pretalxPlugins = lib.recurseIntoAttrs (callPackage ./pkgs/pretalx/plugins.nix {});
   in rec {
+    atomic-cli = callPackage ./pkgs/atomic-cli {};
     atomic-server = callPackage ./pkgs/atomic-server {};
     flarum = callPackage ./pkgs/flarum {};
     gnunet-messenger-cli = callPackage ./pkgs/gnunet-messenger-cli {};
diff --git a/pkgs/atomic-cli/default.nix b/pkgs/atomic-cli/default.nix
new file mode 100644
index 00000000..bf4ed079
--- /dev/null
+++ b/pkgs/atomic-cli/default.nix
@@ -0,0 +1,26 @@
+{
+  lib,
+  rustPlatform,
+  fetchCrate,
+  stdenv,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "atomic-cli";
+  version = "0.34.5";
+
+  src = fetchCrate {
+    inherit pname version;
+    hash = "sha256-97JltSMuNETcgm5jfb2tOjwgw87J0u8qs+TIViT0PBo=";
+  };
+
+  cargoHash = "sha256-NehXV26PBOD+V1KZo8I2EQ7Hp32ccT6e51v5qESj+l4=";
+
+  doCheck = false; # TODO(jl): broken upstream
+
+  meta = with lib; {
+    description = "CLI tool to create, store, query, validate and convert Atomic Data";
+    homepage = "https://crates.io/crates/atomic-cli";
+    license = licenses.mit;
+    maintainers = with maintainers; [];
+  };
+}
diff --git a/pkgs/atomic-server/default.nix b/pkgs/atomic-server/default.nix
index dcb5a927..c13566f3 100644
--- a/pkgs/atomic-server/default.nix
+++ b/pkgs/atomic-server/default.nix
@@ -1,9 +1,9 @@
-{ lib
-, rustPlatform
-, fetchCrate
-, stdenv
+{
+  lib,
+  rustPlatform,
+  fetchCrate,
+  stdenv,
 }:
-
 rustPlatform.buildRustPackage rec {
   pname = "atomic-server";
   version = "0.34.5";
@@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec {
     description = "A Rust library to serialize, parse, store, convert, validate, edit, fetch and store Atomic Data. Powers both atomic-cli and atomic-server.";
     homepage = "docs.atomicdata.dev";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [];
   };
 }