diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix
index 302508a4aa..1f6b17b38e 100644
--- a/nix/pkgs/default.nix
+++ b/nix/pkgs/default.nix
@@ -1,4 +1,5 @@
 args: {
   javaws-env = import ./javaws-env.nix args;
   plex-pass = import ./plex-pass.nix args;
+  heptapod-runner = import ./heptapod-runner.nix args;
 }
diff --git a/nix/pkgs/heptapod-runner.nix b/nix/pkgs/heptapod-runner.nix
new file mode 100644
index 0000000000..f7740ad6f2
--- /dev/null
+++ b/nix/pkgs/heptapod-runner.nix
@@ -0,0 +1,21 @@
+{ pkgs, ... }:
+let
+  version = "hpd-0.2.0";
+  newSrc = pkgs.fetchhg {
+    url = "https://mirror.octobus.net/heptapod/heptapod-runner";
+    rev = "b4fda456f403";
+    sha256 = "1ybkd2jnq2dvkj157w2nlf9rmrgbd8kas43kimi9aarajgi9sri1";
+  };
+in
+pkgs.gitlab-runner.overrideAttrs (oldAttrs: rec {
+  inherit version;
+  buildInputs = [
+    (pkgs.mercurial.overrideAttrs (hgOldAttrs: rec {
+      postInstall = ''
+        mkdir -p "$out/etc/mercurial"
+        cp "${newSrc}/dockerfiles/build/runner.hgrc" "$out/etc/mercurial/hgrc"
+      '';
+    }))
+  ];
+  src = newSrc;
+})