From cf5a892a242e4ee481aada0938d8ada4256007bb Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 12 Sep 2020 14:30:53 +0100 Subject: [PATCH 1/2] pythonPackages.korean-lunar-calendar: init at 0.2.1 --- .../korean-lunar-calendar/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/korean-lunar-calendar/default.nix diff --git a/pkgs/development/python-modules/korean-lunar-calendar/default.nix b/pkgs/development/python-modules/korean-lunar-calendar/default.nix new file mode 100644 index 00000000000..41569ac9dc9 --- /dev/null +++ b/pkgs/development/python-modules/korean-lunar-calendar/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "korean-lunar-calendar"; + version = "0.2.1"; + + src = fetchPypi { + inherit version; + pname = "korean_lunar_calendar"; + sha256 = "0p97r21298ipgvsqh978aq2n6cvybzp8bskcvj15mm1f76qm9khj"; + }; + + # no real tests + pythonImportsCheck = [ "korean_lunar_calendar" ]; + + meta = with stdenv.lib; { + description = "A library to convert Korean lunar-calendar to Gregorian calendar."; + homepage = "https://github.com/usingsky/korean_lunar_calendar_py"; + license = licenses.mit; + maintainers = [ maintainers.ris ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 702e209650b..68be01a3dec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3188,6 +3188,8 @@ in { konfig = callPackage ../development/python-modules/konfig { }; + korean-lunar-calendar = callPackage ../development/python-modules/korean-lunar-calendar { }; + kubernetes = callPackage ../development/python-modules/kubernetes { }; labelbox = callPackage ../development/python-modules/labelbox { }; From 9fb14d899da482468359fee171546b86d0f97129 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 12 Sep 2020 14:31:30 +0100 Subject: [PATCH 2/2] pythonPackages.holidays: fix build by adding korean-lunar-calendar dependency --- .../python-modules/holidays/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 79d49e654f9..10ee1bbf2e7 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -1,4 +1,11 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, dateutil, convertdate }: +{ stdenv +, buildPythonPackage +, fetchPypi +, convertdate +, dateutil +, korean-lunar-calendar +, six +}: buildPythonPackage rec { pname = "holidays"; @@ -9,7 +16,13 @@ buildPythonPackage rec { sha256 = "839281f2b1ae7ac576da7951472482f6e714818296853107ea861fa60f5013cc"; }; - propagatedBuildInputs = [ six dateutil convertdate ]; + propagatedBuildInputs = [ + convertdate + dateutil + korean-lunar-calendar + six + ]; + pythonImportsCheck = [ "holidays" ]; meta = with stdenv.lib; { homepage = "https://github.com/dr-prodigy/python-holidays";