From 12ed9dfd25ceb80fbddea56fb2a6622997682a5e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 30 Sep 2018 15:09:03 -0700
Subject: gcalcli: 3.4.0 -> 4.0.0a4 (#47068)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gcalcli/versions
---
 pkgs/applications/misc/gcalcli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/applications/misc/gcalcli/default.nix')

diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix
index 6a7a7ae604de..25ea9ef06b84 100644
--- a/pkgs/applications/misc/gcalcli/default.nix
+++ b/pkgs/applications/misc/gcalcli/default.nix
@@ -33,14 +33,14 @@ let
   };
 
 in with py.pkgs; buildPythonApplication rec {
-  version = "3.4.0";
+  version = "4.0.0a4";
   name = "gcalcli-${version}";
 
   src = fetchFromGitHub {
     owner  = "insanum";
     repo   = "gcalcli";
     rev    = "v${version}";
-    sha256 = "171awccgnmfv4j7m2my9387sjy60g18kzgvscl6pzdid9fn9rrm8";
+    sha256 = "00giq5cdigidzv5bz4wgzi1yp6xlf2rdcy6ynmsc6bcf0cl5x64d";
   };
 
   propagatedBuildInputs = [
@@ -55,7 +55,7 @@ in with py.pkgs; buildPythonApplication rec {
       "command = '${libnotify}/bin/notify-send -i view-calendar-upcoming-events -u critical -a Calendar %s'"
   '';
 
-  # There are no tests as of 3.4.0
+  # There are no tests as of 4.0.0a4
   doCheck = false;
 
   meta = with lib; {
-- 
cgit 1.4.1


From d2866f5afadf89df93a99755fbf8a98a339e5602 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 8 Oct 2018 12:45:51 +0800
Subject: gcalcli: use python3 i/o python2 so we can drop our overrides

---
 pkgs/applications/misc/gcalcli/default.nix | 38 ++++--------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

(limited to 'pkgs/applications/misc/gcalcli/default.nix')

diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix
index 25ea9ef06b84..ac8d082513b2 100644
--- a/pkgs/applications/misc/gcalcli/default.nix
+++ b/pkgs/applications/misc/gcalcli/default.nix
@@ -1,38 +1,9 @@
-{ stdenv, lib, fetchFromGitHub, python2
+{ stdenv, lib, fetchFromGitHub, python3
 , libnotify ? null }:
 
-let
-  py = python2.override {
-    packageOverrides = self: super: {
-      google_api_python_client = super.google_api_python_client.overridePythonAttrs (oldAttrs: rec {
-        version = "1.5.1";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "1ggxk094vqr4ia6yq7qcpa74b4x5cjd5mj74rq0xx9wp2jkrxmig";
-        };
-      });
+with python3.pkgs;
 
-      oauth2client = super.oauth2client.overridePythonAttrs (oldAttrs: rec {
-        version = "1.4.12";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "0phfk6s8bgpap5xihdk1xv2lakdk1pb3rg6hp2wsg94hxcxnrakl";
-        };
-      });
-
-      uritemplate = super.uritemplate.overridePythonAttrs (oldAttrs: rec {
-        version = "0.6";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "1zapwg406vkwsirnzc6mwq9fac4az8brm6d9bp5xpgkyxc5263m3";
-        };
-        # there are no checks in this version
-        doCheck = false;
-      });
-    };
-  };
-
-in with py.pkgs; buildPythonApplication rec {
+buildPythonApplication rec {
   version = "4.0.0a4";
   name = "gcalcli-${version}";
 
@@ -45,7 +16,6 @@ in with py.pkgs; buildPythonApplication rec {
 
   propagatedBuildInputs = [
     dateutil gflags httplib2 parsedatetime six vobject
-    # overridden
     google_api_python_client oauth2client uritemplate
   ] ++ lib.optional (!isPy3k) futures;
 
@@ -59,8 +29,8 @@ in with py.pkgs; buildPythonApplication rec {
   doCheck = false;
 
   meta = with lib; {
-    homepage = https://github.com/insanum/gcalcli;
     description = "CLI for Google Calendar";
+    homepage = https://github.com/insanum/gcalcli;
     license = licenses.mit;
     maintainers = with maintainers; [ nocoolnametom ];
     inherit version;
-- 
cgit 1.4.1