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: 77b43a35c80a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 127d1fb3a79a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 27, 2020

  1. mycli: 1.21.1 -> 1.22.1

    @jojosch
    jojosch committed Jul 27, 2020
    Copy the full SHA
    32fc1d6 View commit details

  2. Merge pull request #93965 from jojosch/mycli-1.22.1 

    mycli: 1.21.1 -> 1.22.1
    @Ma27
    Ma27 authored Jul 27, 2020
    Copy the full SHA
    127d1fb View commit details
Showing with 4 additions and 9 deletions.
  1. +4 −9 pkgs/tools/admin/mycli/default.nix
13 changes: 4 additions & 9 deletions pkgs/tools/admin/mycli/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@ with python3.pkgs;

buildPythonApplication rec {
pname = "mycli";
version = "1.21.1";
version = "1.22.1";

src = fetchPypi {
inherit pname version;
sha256 = "1q9p0yik9cpvpxjs048anvhicfcna84mpl7axv9bwgr48w40lqwg";
sha256 = "18qxxrpdksg3s73va7nkbkwi34kg9m1pls7w4fh5f4jk4p434zsf";
};

propagatedBuildInputs = [
@@ -24,13 +24,8 @@ buildPythonApplication rec {
export HOME=.
export LC_ALL="en_US.UTF-8"
py.test
'';

# TODO: remove with next release
postPatch = ''
substituteInPlace setup.py \
--replace "prompt_toolkit>=2.0.6,<3.0.0" "prompt_toolkit"
py.test \
--ignore=mycli/packages/paramiko_stub/__init__.py
'';

meta = {