diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-09-24 13:26:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-24 13:26:27 +0100 |
commit | 3e270ff919c7b0c2e0468a68fc5f9656ebd952eb (patch) | |
tree | 80bc85305341ad1f1c2cd25311f506030719e1c3 | |
parent | c16c117048fadf46d06a73ef19a787508ba0bfc0 (diff) | |
parent | 2791f43eeb8a477fdf3d00236196342c7dd4c66f (diff) | |
download | nixpkgs-3e270ff919c7b0c2e0468a68fc5f9656ebd952eb.tar nixpkgs-3e270ff919c7b0c2e0468a68fc5f9656ebd952eb.tar.gz nixpkgs-3e270ff919c7b0c2e0468a68fc5f9656ebd952eb.tar.bz2 nixpkgs-3e270ff919c7b0c2e0468a68fc5f9656ebd952eb.tar.lz nixpkgs-3e270ff919c7b0c2e0468a68fc5f9656ebd952eb.tar.xz nixpkgs-3e270ff919c7b0c2e0468a68fc5f9656ebd952eb.tar.zst nixpkgs-3e270ff919c7b0c2e0468a68fc5f9656ebd952eb.zip |
Merge pull request #46668 from mbode/doitlive_4
doitlive: 3.0.3 -> 4.0.1
-rw-r--r-- | pkgs/development/python-modules/click-completion/default.nix | 23 | ||||
-rw-r--r-- | pkgs/development/python-modules/click-didyoumean/default.nix | 22 | ||||
-rw-r--r-- | pkgs/development/python-modules/shellingham/default.nix | 19 | ||||
-rw-r--r-- | pkgs/tools/misc/doitlive/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 6 |
5 files changed, 73 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix new file mode 100644 index 00000000000..a6b36232531 --- /dev/null +++ b/pkgs/development/python-modules/click-completion/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, + click, jinja2, shellingham, six +}: + +buildPythonPackage rec { + pname = "click-completion"; + version = "0.4.1"; + disabled = (!isPy3k); + + src = fetchPypi { + inherit pname version; + sha256 = "1fjm22dyma26jrx4ki2z4dwbhcah4r848fz381x64sz5xxq3xdrk"; + }; + + propagatedBuildInputs = [ click jinja2 shellingham six ]; + + meta = with stdenv.lib; { + description = "Add or enhance bash, fish, zsh and powershell completion in Click"; + homepage = https://github.com/click-contrib/click-completion; + license = licenses.mit; + maintainers = with maintainers; [ mbode ]; + }; +} diff --git a/pkgs/development/python-modules/click-didyoumean/default.nix b/pkgs/development/python-modules/click-didyoumean/default.nix new file mode 100644 index 00000000000..4cd2ea15029 --- /dev/null +++ b/pkgs/development/python-modules/click-didyoumean/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, + click +}: + +buildPythonPackage rec { + pname = "click-didyoumean"; + version = "0.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1svaza5lpvdbmyrx5xi0riqzq4hb9wnlpqrg6r8zy14pbi42j8hi"; + }; + + propagatedBuildInputs = [ click ]; + + meta = with stdenv.lib; { + description = "Enable git-like did-you-mean feature in click"; + homepage = https://github.com/click-contrib/click-didyoumean; + license = licenses.mit; + maintainers = with maintainers; [ mbode ]; + }; +} diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix new file mode 100644 index 00000000000..57cafe2624c --- /dev/null +++ b/pkgs/development/python-modules/shellingham/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi +}: + +buildPythonPackage rec { + pname = "shellingham"; + version = "1.2.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0x1hja3jzvh7xmd0sxnfw9hi3k419s95vb7jjzh76yydzvss1r2q"; + }; + + meta = with stdenv.lib; { + description = "Tool to Detect Surrounding Shell"; + homepage = https://github.com/sarugaku/shellingham; + license = licenses.isc; + maintainers = with maintainers; [ mbode ]; + }; +} diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/tools/misc/doitlive/default.nix index 3520d67abd2..a8ff34af975 100644 --- a/pkgs/tools/misc/doitlive/default.nix +++ b/pkgs/tools/misc/doitlive/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "doitlive"; - version = "3.0.3"; + version = "4.0.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "19i16ca835rb3gal1sxyvpyilj9a80n6nikf0smlzmxck38x86fj"; + sha256 = "1icnjkczy52i3cp1fmsijqny571fz1h4b3wpdzz79cn90fr326pc"; }; - propagatedBuildInputs = with python3Packages; [ click ]; + propagatedBuildInputs = with python3Packages; [ click click-completion click-didyoumean ]; # disable tests (too many failures) doCheck = false; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0354bdda6ef..e88a99042ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -560,6 +560,8 @@ in { serversyncstorage = callPackage ../development/python-modules/serversyncstorage {}; + shellingham = callPackage ../development/python-modules/shellingham {}; + simpleeval = callPackage ../development/python-modules/simpleeval { }; singledispatch = callPackage ../development/python-modules/singledispatch { }; @@ -1544,6 +1546,10 @@ in { click = callPackage ../development/python-modules/click {}; + click-completion = callPackage ../development/python-modules/click-completion {}; + + click-didyoumean = callPackage ../development/python-modules/click-didyoumean {}; + click-log = callPackage ../development/python-modules/click-log {}; click-plugins = callPackage ../development/python-modules/click-plugins {}; |