From c5d03b795e7506de57463efc6ceff6272d5f16ea Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Sat, 9 May 2020 18:15:12 +0100
Subject: [PATCH] ops/nixos: give everything a consistent mercurial

---
 ops/nixos/lib/common.nix         | 5 ++++-
 ops/nixos/porcorosso/default.nix | 3 ---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ops/nixos/lib/common.nix b/ops/nixos/lib/common.nix
index b900a921d6..425785638e 100644
--- a/ops/nixos/lib/common.nix
+++ b/ops/nixos/lib/common.nix
@@ -21,7 +21,10 @@ in
   time.timeZone = mkDefault "Etc/UTC";
 
   environment.systemPackages = with pkgs; [
-    vim mercurial rxvt_unicode.terminfo rebuilder
+    vim rxvt_unicode.terminfo rebuilder
+    (mercurial.overridePythonAttrs (origAttrs: {
+      propagatedBuildInputs = origAttrs.propagatedBuildInputs ++ [python3Packages.hg-evolve];
+    }))
   ];
 
   networking.firewall = {
diff --git a/ops/nixos/porcorosso/default.nix b/ops/nixos/porcorosso/default.nix
index 72f0af5aaa..7c10ca5b8f 100644
--- a/ops/nixos/porcorosso/default.nix
+++ b/ops/nixos/porcorosso/default.nix
@@ -87,9 +87,6 @@ in {
     (steam.override { extraProfile = nvidia-offload-profile; })
     rebuilder
     blackbox
-    (mercurial.overridePythonAttrs (origAttrs: {
-      propagatedBuildInputs = origAttrs.propagatedBuildInputs ++ [python3Packages.hg-evolve];
-    }))
     arcanist
     age
     (depot.nix.pkgs.secretsync.configure {