Unverified Commit f87c4d09 authored by SamLukeYes's avatar SamLukeYes
Browse files

xonsh: 0.22.8 -> 0.23.0

parent b38b88e3

pkgs/by-name/xo/xonsh/unwrapped.nix

+22 −10
Original line number Diff line number Diff line
@@ -16,9 +16,12 @@ 
  pip,

  pyte,

  pytest-mock,

  pytest-rerunfailures,

  pytest-subprocess,

  pytest-timeout,

  pytestCheckHook,

  requests,

  virtualenv,



  man,

  util-linux,
@@ -32,7 +35,7 @@ 


buildPythonPackage rec {

  pname = "xonsh";

  version = "0.22.8";

  version = "0.23.0";

  pyproject = true;



  # PyPI package ships incomplete tests
@@ -40,7 +43,7 @@ buildPythonPackage rec { 
    owner = "xonsh";

    repo = "xonsh";

    tag = version;

    hash = "sha256-NOQs21Ahp2oMx1Lw1ekvb2aqUWwIXw1WyC9ZE5V9wJI=";

    hash = "sha256-hZMA1GMyzo2297iTrgOdRuqjqR55KughPsaL0EZWLWM=";

  };



  build-system = [
@@ -61,9 +64,14 @@ buildPythonPackage rec { 
    pip

    pyte

    pytest-mock

    pytest-rerunfailures

    pytest-subprocess

    pytest-timeout

    pytestCheckHook

    requests



    # required by test_xonsh_activator

    virtualenv

  ]

  ++ lib.optionals (!stdenv.isDarwin) [

    # required by test_man_completion
@@ -74,16 +82,16 @@ buildPythonPackage rec { 
  disabledTests = [

    # fails on sandbox

    "test_colorize_file"

    "test_xonsh_activator"

    "test_repath_HOME_PATH_itself"

    "test_repath_HOME_PATH_var"

    "test_repath_HOME_PATH_var_brace"



    # flaky tests in test_integrations.py

    "test_script"

    "test_catching_system_exit"

    "test_catching_exit_signal"

    "test_alias_stability"

    "test_captured_subproc_is_not_affected_next_command"

    "test_spec_decorator_alias"

    "test_alias_stability_exception"



    # flaky tests in test_python.py

    "test_complete_import"
@@ -112,18 +120,22 @@ buildPythonPackage rec { 
    "test_on_command_not_found_replacement"

    "test_skipper_command"

    "test_xonsh_lexer_no_win"

    "test_on_command_not_found_dict_without_env"

  ];



  disabledTestPaths = [

    # don't run stress tests when building package

    "tests/xintegration/test_stress.py"

  ];



  # https://github.com/NixOS/nixpkgs/issues/248978

  dontWrapPythonPrograms = true;



  env.LC_ALL = "en_US.UTF-8";



  postPatch = ''

    sed -i -e 's|/bin/ls|${lib.getExe' coreutils "ls"}|' tests/test_execer.py

    sed -i -e 's|SHELL=xonsh|SHELL=$out/bin/xonsh|' tests/test_integrations.py

    sed -i -e 's|SHELL=xonsh|SHELL=$out/bin/xonsh|' tests/xintegration/test_integrations.py



    for script in tests/test_integrations.py scripts/xon.sh $(find -name "*.xsh"); do

    for script in tests/xintegration/test_integrations.py scripts/xon.sh $(find -name "*.xsh"); do

      sed -i -e 's|/usr/bin/env|${lib.getExe' coreutils "env"}|' $script

    done

    patchShebangs .
@@ -139,7 +151,7 @@ buildPythonPackage rec { 


  meta = {

    homepage = "https://xon.sh/";

    description = "Python-ish, BASHwards-compatible shell";

    description = "Python-powered shell";

    changelog = "https://github.com/xonsh/xonsh/blob/${version}/CHANGELOG.md";

    license = with lib.licenses; [ bsd3 ];

    mainProgram = "xonsh";