Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 32a898bb1540
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f87374dc693e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Sep 2, 2020

  1. xonsh: 0.9.20 -> 0.9.21 

    https://github.com/xonsh/xonsh/releases/tag/0.9.21
    @marsam
    marsam committed Sep 2, 2020
    Copy the full SHA
    b03a618 View commit details

Commits on Sep 5, 2020

  1. Merge pull request #96988 from marsam/update-xonsh 

    xonsh: 0.9.20 -> 0.9.21
    @marsam
    marsam authored Sep 5, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f87374d View commit details
Showing with 2 additions and 11 deletions.
  1. +2 −11 pkgs/shells/xonsh/default.nix
13 changes: 2 additions & 11 deletions pkgs/shells/xonsh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,31 +4,22 @@
, glibcLocales
, coreutils
, git
, fetchpatch
}:

python3Packages.buildPythonApplication rec {
pname = "xonsh";
version = "0.9.20";
version = "0.9.21";

# fetch from github because the pypi package ships incomplete tests
src = fetchFromGitHub {
owner = "xonsh";
repo = "xonsh";
rev = version;
sha256 = "05phrwqd1c64531y78zxkxd4w1cli8yj3x2cqch7nkzbyz93608p";
sha256 = "16k8506fk54krpkls374cn3vm1dp9ixi0byh5xvi3m5a4bnbvrs0";
};

LC_ALL = "en_US.UTF-8";

patches = [
# Fix vox tests. Remove with the next release
(fetchpatch {
url = "https://github.com/xonsh/xonsh/commit/00aeb7645af97134495cc6bc5fe2f41922df8676.patch";
sha256 = "0hx5jk22wxgmjzmqbxr2pjs3mwh7p0jwld0xhslc1s6whbjml25h";
})
];

postPatch = ''
sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py
sed -ie "s|SHELL=xonsh|SHELL=$out/bin/xonsh|" tests/test_integrations.py