From d262598f6ffad9ab39676ac0b23c3833f378428c Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Mon, 11 Nov 2024 20:31:48 +0000
Subject: [PATCH 1/4] nix/pkgs: add hg-git

---
 nix/pkgs/default.nix |  4 ++--
 nix/pkgs/hg-git.nix  | 26 --------------------------
 2 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 nix/pkgs/hg-git.nix

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;
-  };
-})

From 6eac2e2d20b1c34dc699ff903c28a016bff9e186 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Mon, 11 Nov 2024 22:57:11 +0000
Subject: [PATCH 2/4] world-of-goo2: bump

---
 nix/pkgs/world-of-goo2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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.";
   };
 

From b27583fad21dde794f7c0352f4f81d243a89e8e0 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Mon, 11 Nov 2024 22:57:45 +0000
Subject: [PATCH 3/4] dulwich: 0.22.1 -> 0.22.5

---
 .../development/python-modules/dulwich/default.nix   | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
index 91a1869099..752a09be22 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
@@ -20,7 +20,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.22.1";
+  version = "0.22.5";
   pname = "dulwich";
   format = "setuptools";
 
@@ -30,17 +30,9 @@ buildPythonPackage rec {
     owner = "jelmer";
     repo = "dulwich";
     rev = "refs/tags/dulwich-${version}";
-    hash = "sha256-bf3ZUMX4afpdTBpFnx0HMyzCNG6V/p4eOl36djxGbtk=";
+    hash = "sha256-/YqC7y8PU+H2qjPqqzdw6iSSSElK709izLTcs9qbt1I=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      name = "dulwich-geventhttpclient-api-breakage.patch";
-      url = "https://github.com/jelmer/dulwich/commit/5f0497de9c37ac4f4e8f27bed8decce13765d3df.patch";
-      hash = "sha256-0GgDgmYuLCsMc9nRRLNL2W6WYrkZ/1ZnZBQusEAzLKI=";
-    })
-  ];
-
   build-system = [
     setuptools
     setuptools-rust

From b50ad2d685f38f087a57a540182860f6a34d0d66 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Mon, 11 Nov 2024 22:58:01 +0000
Subject: [PATCH 4/4] gitignore: also ignore 'result'

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 7d64ba48c3..e992ae825d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@
 /go/trains/*/lukegb-trains.json
 /py/icalfilter/config/*
 /rust/*/target/*
+result
 result-*
 
 *.sw?