aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJade Lovelace <lix@jade.fyi>2024-06-05 21:24:14 -0700
committerJade Lovelace <lix@jade.fyi>2024-06-06 14:50:27 -0700
commit1659404626b80509db162fddcc1f5294fe590afa (patch)
treec309e39bdfaf93298ccc73544edd9ebb5d8f4c2b
parente0748377dc1c2f295d1d60b9892bffabc030d4b4 (diff)
Add xonsh to the shell
Change-Id: If8f3825d2bdcc3f1d00583a11d890c1c8ab37b9f
-rw-r--r--package.nix13
1 files changed, 13 insertions, 0 deletions
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.