tim.mccarthy/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix xonsh overlay on Linux

Browse Source 
switched overrideAttrs to overridePythonAttrs and disabled tests that
make bad assumptions about user environment
This commit is contained in:
Tim McCarthy
2022-05-17 16:24:18 -07:00
parent d5b85163a9
commit d105b1aff2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nix/home.nix
View File

@@ -24,7 +24,6 @@
# Enable integration with generic Linux OSs # Enable integration with generic Linux OSs
targets.genericLinux.enable = pkgs.stdenv.isLinux; targets.genericLinux.enable = pkgs.stdenv.isLinux;
home.packages = with pkgs; [ home.packages = with pkgs; [
# Defined in Xonsh overlay # Defined in Xonsh overlay
xonsh_with_plugins xonsh_with_plugins

7
nix/overlays/xonsh.nix
View File

@@ -1,5 +1,5 @@
final: prev: { final: prev: {
xonsh = prev.xonsh.overrideAttrs (old: rec { xonsh = prev.xonsh.overridePythonAttrs (old: rec {
version = "0.12.4"; version = "0.12.4";
src = final.fetchFromGitHub { src = final.fetchFromGitHub {
owner = "xonsh"; owner = "xonsh";
@@ -8,12 +8,13 @@ final: prev: {
sha256 = "0kdps0gf0767zy0fs6qn39rv4z3x7ck0qz1pzx6962593171yk8b"; sha256 = "0kdps0gf0767zy0fs6qn39rv4z3x7ck0qz1pzx6962593171yk8b";
}; };
propagatedBuildInputs = prev.xonsh.propagatedBuildInputs ++ [final.python3Packages.virtualenv]; propagatedBuildInputs = prev.xonsh.propagatedBuildInputs ++ [final.python3Packages.virtualenv];
disabledTests = prev.xonsh.disabledTests ++ ["test_commands_cache" "test_ptk_highlight" "test_command_completers"];
}); });
python39 = prev.python39.override { python39 = prev.python39.override {
self = prev.python39; self = prev.python39;
packageOverrides = python_final: python_super: { packageOverrides = python_final: python_super: {
prompt-toolkit = python_super.prompt-toolkit.overrideAttrs (old: rec { prompt-toolkit = python_super.prompt-toolkit.overridePythonAttrs (old: rec {
version = "3.0.29"; version = "3.0.29";
src = python_final.fetchPypi { src = python_final.fetchPypi {
pname = "prompt_toolkit"; pname = "prompt_toolkit";
@@ -40,7 +41,7 @@ final: prev: {
''; '';
}; };
xonsh_with_plugins = final.xonsh.overrideAttrs (old: { xonsh_with_plugins = final.xonsh.overridePythonAttrs (old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ final.xonsh_pyenv.python.pkgs.selectPkgs final.xonsh_pyenv.python.pkgs; propagatedBuildInputs = old.propagatedBuildInputs ++ final.xonsh_pyenv.python.pkgs.selectPkgs final.xonsh_pyenv.python.pkgs;
}); });
} }