From a5ed0154df53e42ba424e40cdc339a354ec7a7d4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 25 Mar 2020 17:01:29 -0700 Subject: [PATCH 1/4] python3Packages.clikit: 0.4.1 -> 0.4.3 --- pkgs/development/python-modules/clikit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix index 94f3fa08b13..054b6edee6d 100644 --- a/pkgs/development/python-modules/clikit/default.nix +++ b/pkgs/development/python-modules/clikit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "clikit"; - version = "0.4.1"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "8ae4766b974d7b1983e39d501da9a0aadf118a907a0c9b50714d027c8b59ea81"; + sha256 = "0glppxx0pyppjcigzs8h16srlbxb6nci0282xfy3ayvwbq8pwbbf"; }; propagatedBuildInputs = [ From f171f421dbbe9b5e6244ec9638b971d7308ddc3f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 25 Mar 2020 17:03:12 -0700 Subject: [PATCH 2/4] python3Packages.pastel: 0.1.0 -> 0.2.0 --- .../python-modules/pastel/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pastel/default.nix b/pkgs/development/python-modules/pastel/default.nix index 532970c62c2..a44b4253ca5 100644 --- a/pkgs/development/python-modules/pastel/default.nix +++ b/pkgs/development/python-modules/pastel/default.nix @@ -1,24 +1,21 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest }: +{ lib, buildPythonPackage, fetchPypi, poetry, pytest }: buildPythonPackage rec { pname = "pastel"; - version = "0.1.0"; + version = "0.2.0"; - # No tests in PyPi tarball - src = fetchFromGitHub { - owner = "sdispater"; - repo = "pastel"; - rev = version; - sha256 = "1b4ag7jr7j0sxly5g29imdq8g0d4ixhbck55dblr45mlsidydx0s"; + src = fetchPypi { + inherit pname version; + sha256 = "0dnaw44ss10i10z4ksy0xljknvjap7rb7g0b8p6yzm5x4g2my5a6"; }; checkInputs = [ pytest ]; checkPhase = '' - pytest tests -sq + pytest ''; meta = with lib; { - homepage = https://github.com/sdispater/pastel; + homepage = "https://github.com/sdispater/pastel"; description = "Bring colors to your terminal"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; From c9f09584bc2f77f4ad302031415fcd506aa9586f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 25 Mar 2020 17:04:38 -0700 Subject: [PATCH 3/4] python3Packages.poetry: fix hash --- pkgs/development/python-modules/poetry/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index f007ff3df1d..481fd2c5feb 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -36,7 +36,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0y528095njf28isbcp5iwbf12j67xhxnrkac93pws0zy133v7kc1"; + sha256 = "02h387k0xssvv78yy82pcpknpq4w5ym2in1zl8cg9r5wljl5w6cf"; }; postPatch = '' From 44df87416d509428c6f2c0edd82e3758f13d5bee Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 25 Mar 2020 17:04:56 -0700 Subject: [PATCH 4/4] python3Packages.xdg: init at 4.0.1 --- .../python-modules/xdg/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/xdg/default.nix diff --git a/pkgs/development/python-modules/xdg/default.nix b/pkgs/development/python-modules/xdg/default.nix new file mode 100644 index 00000000000..8b2d73b00fb --- /dev/null +++ b/pkgs/development/python-modules/xdg/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 +, clikit +, poetry +, pytestCheckHook +}: + +buildPythonPackage rec { + version = "4.0.1"; + pname = "xdg"; + disabled = isPy27; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "srstevenson"; + repo = pname; + rev = version; + sha256 = "13kgnbwam6wmdbig0m98vmyjcqrp0j62nmfknb6prr33ns2nxbs2"; + }; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ + clikit + ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "XDG Base Directory Specification for Python"; + homepage = "https://github.com/srstevenson/xdg"; + license = licenses.isc; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 43a3af13aef..9ce7337b3a1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3943,6 +3943,8 @@ in { colored = callPackage ../development/python-modules/colored { }; + xdg = callPackage ../development/python-modules/xdg { }; + xdis = callPackage ../development/python-modules/xdis { }; xnd = callPackage ../development/python-modules/xnd { };