From 5bb9988ce95fa0954298d3f2ef4d861cb4b6eb57 Mon Sep 17 00:00:00 2001 From: Leroy Hopson Date: Sat, 20 Jun 2015 12:46:26 +1200 Subject: [PATCH 1/3] maintainers: add myself for upcoming packages --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 10036c19360..9cc992914a4 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -132,6 +132,7 @@ lassulus = "Lassulus "; lethalman = "Luca Bruno "; lhvwb = "Nathaniel Baxter "; + lihop = "Leroy Hopson "; linquize = "Linquize "; linus = "Linus Arver "; lnl7 = "Daiderd Jordan "; From 9b623def113f757b330cdf7fa4e555356f14bd12 Mon Sep 17 00:00:00 2001 From: Leroy Hopson Date: Sat, 20 Jun 2015 12:47:05 +1200 Subject: [PATCH 2/3] jdcal: init at 1.0 a dependency of openpyxl --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 45148de8ac3..ec15c4540a7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3446,6 +3446,26 @@ let }; }; + jdcal = buildPythonPackage rec { + version = "1.0"; + name = "jdcal-${version}"; + + src = pkgs.fetchFromGitHub { + owner = "phn"; + repo = "jdcal"; + rev = "v${version}"; + sha256 = "0jjgrrylraqzk3n97hay4gj00ky6vlvkfaapfgqlbcxyq30j24vq"; + }; + + meta = { + description = "A module containing functions for converting between Julian dates and calendar dates"; + homepage = "https://github.com/phn/jdcal"; + license = licenses.bsd2; + maintainers = with maintainers; [ lihop ]; + platforms = platforms.all; + }; + }; + jsonwatch = buildPythonPackage rec { name = "jsonwatch-0.2.0"; From 108dbfba9a9aae8a3b5ebaab5425e7d08f021ca4 Mon Sep 17 00:00:00 2001 From: Leroy Hopson Date: Sat, 20 Jun 2015 12:48:00 +1200 Subject: [PATCH 3/3] openpyxl: init at 2.2.4 --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec15c4540a7..6e6e9d4ddc2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8099,6 +8099,27 @@ let doCheck = false; }; + openpyxl = buildPythonPackage rec { + version = "2.2.4"; + name = "openpyxl-${version}"; + + src = pkgs.fetchhg { + url = "https://bitbucket.org/openpyxl/openpyxl"; + rev = "${version}"; + sha256 = "1g9imbg4sjfyv5sqg2s7h4svhdmbnvq16hvc1a8jpaqq8nc2vjj2"; + }; + + propagatedBuildInputs = with self; [ jdcal ]; + + meta = { + description = "A Python library to read/write Excel 2007 xlsx/xlsm files"; + homepage = "https://openpyxl.readthedocs.org"; + license = licenses.mit; + maintainers = with maintainers; [ lihop ]; + platforms = platforms.all; + }; + }; + # optfunc = buildPythonPackage ( rec { # name = "optfunc-git"; #