diff --git a/pkgs/development/python-modules/cmd2/old.nix b/pkgs/development/python-modules/cmd2/old.nix deleted file mode 100644 index 8f75170c58c4..000000000000 --- a/pkgs/development/python-modules/cmd2/old.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, buildPythonPackage, pythonOlder -, pyperclip, six, pyparsing, vim -, contextlib2 ? null, subprocess32 ? null -, pytest, mock, which, fetchFromGitHub, glibcLocales -, runtimeShell -}: -buildPythonPackage rec { - pname = "cmd2"; - version = "0.8.0"; - - src = fetchFromGitHub { - owner = "python-cmd2"; - repo = "cmd2"; - rev = version; - sha256 = "0nw2b7n7zg51bc3glxw0l9fn91mwjnjshklhmxhyvjbsg7khf64z"; - }; - - LC_ALL="en_US.UTF-8"; - - postPatch = stdenv.lib.optional stdenv.isDarwin '' - # Fake the impure dependencies pbpaste and pbcopy - mkdir bin - echo '#${runtimeShell}' > bin/pbpaste - echo '#${runtimeShell}' > bin/pbcopy - chmod +x bin/{pbcopy,pbpaste} - export PATH=$(realpath bin):$PATH - ''; - - checkInputs= [ pytest mock which vim glibcLocales ]; - checkPhase = '' - # test_path_completion_user_expansion might be fixed in the next release - py.test -k 'not test_path_completion_user_expansion' - ''; - doCheck = !stdenv.isDarwin; - - propagatedBuildInputs = [ - pyperclip - six - pyparsing - ] - ++ stdenv.lib.optional (pythonOlder "3.5") contextlib2 - ++ stdenv.lib.optional (pythonOlder "3.0") subprocess32 - ; - - meta = with stdenv.lib; { - description = "Enhancements for standard library's cmd module"; - homepage = https://github.com/python-cmd2/cmd2; - maintainers = with maintainers; [ teto ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9e3f6c93934..a84637f8b371 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3628,9 +3628,8 @@ in { cachetools = callPackage ../development/python-modules/cachetools {}; - cmd2_8 = callPackage ../development/python-modules/cmd2/old.nix {}; cmd2_9 = callPackage ../development/python-modules/cmd2 {}; - cmd2 = if isPy27 then self.cmd2_8 else self.cmd2_9; + cmd2 = self.cmd2_9; warlock = callPackage ../development/python-modules/warlock { };