diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
new file mode 100644
index 000000000000..b718447e8f80
--- /dev/null
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "nomad-${version}";
+  version = "0.3.2";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/hashicorp/nomad";
+  subPackages = [ "." ];
+
+  src = fetchFromGitHub {
+    owner = "hashicorp";
+    repo = "nomad";
+    inherit rev;
+    sha256 = "1m2pdragpzrq0xbmnba039iiyhb16wirj3n1s52z5r8r0mr7drai";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://www.nomadproject.io/;
+    license = licenses.mpl20;
+    description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ rushmorem ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51f4ada13743..3ed2ea1eeaee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2611,7 +2611,7 @@ in
 
   noip = callPackage ../tools/networking/noip { };
 
-  nomad = goPackages.nomad.bin // { outputs = [ "bin" ]; };
+  nomad = callPackage ../applications/networking/cluster/nomad { };
 
   milu = callPackage ../applications/misc/milu { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index ea3635894238..25f31085da1f 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2260,14 +2260,6 @@ let
     sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib";
   };
 
-  nomad = buildFromGitHub {
-    rev    = "v0.3.2";
-    owner  = "hashicorp";
-    repo   = "nomad";
-    sha256 = "1m2pdragpzrq0xbmnba039iiyhb16wirj3n1s52z5r8r0mr7drai";
-    subPackages = [ "." ];
-  };
-
   ntp = buildFromGitHub {
     rev    = "0a5264e2563429030eb922f258229ae3fee5b5dc";
     owner  = "beevik";