From 20a46e64a7dea224b75b90ce2b64b2b8b58d8b95 Mon Sep 17 00:00:00 2001
From: Tim McCarthy <thoomfish@gmail.com>
Date: Mon, 8 Aug 2022 11:53:03 -0700
Subject: [PATCH] Xonsh no longer needs version overrides

---
 nix/overlays/xonsh.nix | 50 +++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/nix/overlays/xonsh.nix b/nix/overlays/xonsh.nix
index b74babb..f11e8b7 100644
--- a/nix/overlays/xonsh.nix
+++ b/nix/overlays/xonsh.nix
@@ -1,35 +1,35 @@
 final: prev: {
-  xonsh = prev.xonsh.overridePythonAttrs (old: rec {
-    version = "0.12.4";
-    src = final.fetchFromGitHub {
-      owner = "xonsh";
-      repo = "xonsh";
-      rev = version;
-      sha256 = "0kdps0gf0767zy0fs6qn39rv4z3x7ck0qz1pzx6962593171yk8b";
-    };
-    propagatedBuildInputs = prev.xonsh.propagatedBuildInputs ++ [final.python3Packages.virtualenv];
-    disabledTests = prev.xonsh.disabledTests ++ ["test_commands_cache" "test_ptk_highlight" "test_command_completers"];
-  });
+  # xonsh = prev.xonsh.overridePythonAttrs (old: rec {
+  #   version = "0.12.4";
+  #   src = final.fetchFromGitHub {
+  #     owner = "xonsh";
+  #     repo = "xonsh";
+  #     rev = version;
+  #     sha256 = "0kdps0gf0767zy0fs6qn39rv4z3x7ck0qz1pzx6962593171yk8b";
+  #   };
+  #   propagatedBuildInputs = prev.xonsh.propagatedBuildInputs ++ [final.python3Packages.virtualenv];
+  #   disabledTests = prev.xonsh.disabledTests ++ ["test_commands_cache" "test_ptk_highlight" "test_command_completers"];
+  # });
 
-  python39 = prev.python39.override {
-    self = prev.python39;
-    packageOverrides = python_final: python_super: {
-      prompt-toolkit = python_super.prompt-toolkit.overridePythonAttrs (old: rec {
-        version = "3.0.29";
-        src = python_final.fetchPypi {
-          pname = "prompt_toolkit";
-          inherit version;
-          sha256 = "sha256-vWQPYOjOzXTw3CSXE9QzrOLdxitl7gf5bTWOCxUrbqc=";
-        };
-      });
-    };
-  };
+  # python39 = prev.python39.override {
+  #   self = prev.python39;
+  #   packageOverrides = python_final: python_super: {
+  #     prompt-toolkit = python_super.prompt-toolkit.overridePythonAttrs (old: rec {
+  #       version = "3.0.29";
+  #       src = python_final.fetchPypi {
+  #         pname = "prompt_toolkit";
+  #         inherit version;
+  #         sha256 = "sha256-vWQPYOjOzXTw3CSXE9QzrOLdxitl7gf5bTWOCxUrbqc=";
+  #       };
+  #     });
+  #   };
+  # };
 
   # Using mach-nix to fetch unpackaged xontrib plugins
   # adapted from https://github.com/NixOS/nixpkgs/issues/75786#issuecomment-873654103
   mach-nix = import (builtins.fetchGit {
     url = "https://github.com/DavHau/mach-nix/";
-    ref = "refs/tags/3.4.0";
+    ref = "refs/tags/3.5.0";
   }) {
     pkgs = final;
   };