diff --git a/.gitignore b/.gitignore
index 7f9c88e78a..2307a6a733 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@
 /go/trains/*/lukegb-trains.json
 /py/icalfilter/config/*
 /rust/*/target/*
+result
 result-*
 result
 
diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix
index f976a63015..a83e60863b 100644
--- a/nix/pkgs/default.nix
+++ b/nix/pkgs/default.nix
@@ -8,7 +8,6 @@
   plex-pass = import ./plex-pass.nix args;
   secretsync = import ./secretsync args;
   copybara = pkgs.callPackage ./copybara.nix { };
-  hg-git = import ./hg-git.nix args;
   erbium = import ./erbium args;
   sheepshaver = import ./sheepshaver.nix args;
   intermec-cups-driver = pkgs.callPackage ./intermec-cups-driver.nix {};
@@ -26,7 +25,8 @@
   lukegb-wallpapers = pkgs.callPackage ./lukegb-wallpapers {};
   rundeck-bin = pkgs.callPackage ./rundeck-bin {};
   mercurial = pkgs.mercurialFull.withExtensions (pm: with pm; [
-    hg-evolve
+    (hg-evolve.override { mercurial = pkgs.mercurialFull; })
+    (hg-git.override { mercurial = pkgs.mercurialFull; })
   ]);
   ubi_reader = pkgs.python3Packages.callPackage ./ubi_reader {};
   prometheus-bird-exporter-lfty = pkgs.callPackage ./prometheus-bird-exporter-lfty.nix {};
diff --git a/nix/pkgs/hg-git.nix b/nix/pkgs/hg-git.nix
deleted file mode 100644
index 5b4700ad94..0000000000
--- a/nix/pkgs/hg-git.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# SPDX-FileCopyrightText: 2020 Luke Granger-Brown <depot@lukegb.com>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-{ pkgs, ... }:
-with pkgs;
-with pkgs.python3Packages;
-(buildPythonPackage rec {
-  pname = "hg-git";
-  version = "0.9.0a1";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1lhb813zljki3q10bx3n9d7c075s6ahhak5d3a1m6gaxmy6gzj5y";
-  };
-
-  doCheck = false;
-
-  propagatedBuildInputs = [ dulwich ];
-
-  meta = with lib; {
-    description = "Push and pull from a Git server using Mercurial";
-    homepage = "http://hg-git.github.com/";
-    license = licenses.gpl2;
-  };
-})
diff --git a/nix/pkgs/world-of-goo2.nix b/nix/pkgs/world-of-goo2.nix
index 47a3a17aae..4516a99549 100644
--- a/nix/pkgs/world-of-goo2.nix
+++ b/nix/pkgs/world-of-goo2.nix
@@ -5,11 +5,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "worldofgoo2";
-  version = "12329.171";
+  version = "1.0.12478.15";
 
   src = requireFile {
-    name = "World_of_Goo_2-x86_64.${version}.appimage";
-    hash = "sha256-/dOder333lqgKi+dQCIzeVtPObRYsn5LSYldXFXaK8o=";
+    name = "World_of_Goo_2-x86_64-${version}.appimage";
+    hash = "sha256-esFcDFxeCDdl1BVEYdTeHxgkLo0j9HMYmEnPK0fIEhA=";
     message = "Please download World of Goo 2 from the Humble Store and add it to the store.";
   };