From 1659404626b80509db162fddcc1f5294fe590afa Mon Sep 17 00:00:00 2001
From: Jade Lovelace <lix@jade.fyi>
Date: Wed, 5 Jun 2024 21:24:14 -0700
Subject: [PATCH] Add xonsh to the shell

Change-Id: If8f3825d2bdcc3f1d00583a11d890c1c8ab37b9f
---
 package.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/package.nix b/package.nix
index d324fbe00..a39ff4b2e 100644
--- a/package.nix
+++ b/package.nix
@@ -43,6 +43,7 @@
   toml11,
   util-linuxMinimal ? utillinuxMinimal,
   utillinuxMinimal ? null,
+  xonsh-unwrapped,
   xz,
 
   busybox-sandbox-shell,
@@ -408,6 +409,17 @@ stdenv.mkDerivation (finalAttrs: {
         # default LLVM is newer.
         clang-tools_llvm = clang-tools.override { inherit llvmPackages; };
 
+        pythonPackages = (
+          p: [
+            p.yapf
+            p.python-frontmatter
+            (p.toPythonModule xonsh-unwrapped)
+          ]
+        );
+        # FIXME: This will explode when we switch to 24.05 if we don't backport
+        # https://github.com/NixOS/nixpkgs/pull/317636 first
+        pythonEnv = python3.withPackages pythonPackages;
+
         # pkgs.mkShell uses pkgs.stdenv by default, regardless of inputsFrom.
         actualMkShell = mkShell.override { inherit stdenv; };
       in
@@ -431,6 +443,7 @@ stdenv.mkDerivation (finalAttrs: {
           packages =
             lib.optional (stdenv.cc.isClang && hostPlatform == buildPlatform) clang-tools_llvm
             ++ [
+              pythonEnv
               just
               nixfmt
               # Load-bearing order. Must come before clang-unwrapped below, but after clang_tools above.