From d41ae7ee90a325a3ef2d0df3522236702ab330ed Mon Sep 17 00:00:00 2001
From: Erik Timan <dev@timan.info>
Date: Thu, 4 Dec 2014 07:56:53 +0000
Subject: [PATCH 1/2] Add pythonPackages.icalendar

---
 pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b15eefbdac8..9140712d2c5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4672,6 +4672,25 @@ let
     };
   };
 
+  icalendar = buildPythonPackage rec {
+    version = "3.8.4";
+    name = "icalendar-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/i/icalendar/${name}.zip";
+      md5 = "d700e6e75613fd1ee882c4b11c58940c";
+    };
+
+    buildInputs = with self; [ setuptools ];
+    propagatedBuildInputs = with self; [ pytz ];
+
+    meta = with stdenv.lib; {
+      description = "A parser/generator of iCalendar files";
+      homepage = "http://icalendar.readthedocs.org/";
+      license = licenses.bsd2;
+    };
+  };
+
   importlib = if isPy26 then (buildPythonPackage {
     name = "importlib-1.0.2";
     src = pkgs.fetchurl {

From c0e7497484c27f73854739f50b4b1df6b779dff6 Mon Sep 17 00:00:00 2001
From: Erik Timan <dev@timan.info>
Date: Thu, 4 Dec 2014 09:05:36 +0000
Subject: [PATCH 2/2] Add olcai to maintainers

Takes maintainership of pythonPackages.icalendar as well
---
 lib/maintainers.nix                | 1 +
 pkgs/top-level/python-packages.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7ff3a25b3df..aa690e8d110 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -115,6 +115,7 @@
   nslqqq = "Nikita Mikhailov <nslqqq@gmail.com>";
   ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
   offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
+  olcai = "Erik Timan <dev@timan.info>";
   orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
   page = "Carles Pagès <page@cubata.homelinux.net>";
   pashev = "Igor Pashev <pashev.igor@gmail.com>";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9140712d2c5..802f316d026 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4688,6 +4688,7 @@ let
       description = "A parser/generator of iCalendar files";
       homepage = "http://icalendar.readthedocs.org/";
       license = licenses.bsd2;
+      maintainers = [ maintainers.olcai ];
     };
   };