lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Add xonsh to the shell

Browse source 
Change-Id: If8f3825d2bdcc3f1d00583a11d890c1c8ab37b9f
This commit is contained in:
jade 2024-06-05 21:24:14 -07:00
parent e0748377dc
commit 1659404626
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
package.nix
View file

@ -43,6 +43,7 @@
toml11, toml11,
util-linuxMinimal ? utillinuxMinimal, util-linuxMinimal ? utillinuxMinimal,
utillinuxMinimal ? null, utillinuxMinimal ? null,
xonsh-unwrapped,
xz, xz,
busybox-sandbox-shell, busybox-sandbox-shell,
@ -408,6 +409,17 @@ stdenv.mkDerivation (finalAttrs: {
# default LLVM is newer. # default LLVM is newer.
clang-tools_llvm = clang-tools.override { inherit llvmPackages; }; 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. # pkgs.mkShell uses pkgs.stdenv by default, regardless of inputsFrom.
actualMkShell = mkShell.override { inherit stdenv; }; actualMkShell = mkShell.override { inherit stdenv; };
in in
@ -431,6 +443,7 @@ stdenv.mkDerivation (finalAttrs: {
packages = packages =
lib.optional (stdenv.cc.isClang && hostPlatform == buildPlatform) clang-tools_llvm lib.optional (stdenv.cc.isClang && hostPlatform == buildPlatform) clang-tools_llvm
++ [ ++ [
pythonEnv
just just
nixfmt nixfmt
# Load-bearing order. Must come before clang-unwrapped below, but after clang_tools above. # Load-bearing order. Must come before clang-unwrapped below, but after clang_tools above.