public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #48032 from peterhoeg/f/gcal 

gcalcli: use python3 i/o python2 so we can drop our overrides
This commit is contained in:
Peter Hoeg 2018-10-10 17:17:44 +08:00 committed by GitHub
parent 804c227b83 d2866f5afa
commit c616d1a89a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/applications/misc/gcalcli/default.nix
View File

@ -1,38 +1,9 @@
{ stdenv, lib, fetchFromGitHub, python2 { stdenv, lib, fetchFromGitHub, python3
, libnotify ? null }: , libnotify ? null }:
let with python3.pkgs;
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";
};
});
oauth2client = super.oauth2client.overridePythonAttrs (oldAttrs: rec { buildPythonApplication 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 {
version = "4.0.0a4"; version = "4.0.0a4";
name = "gcalcli-${version}"; name = "gcalcli-${version}";
@ -45,7 +16,6 @@ in with py.pkgs; buildPythonApplication rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
dateutil gflags httplib2 parsedatetime six vobject dateutil gflags httplib2 parsedatetime six vobject
# overridden
google_api_python_client oauth2client uritemplate google_api_python_client oauth2client uritemplate
] ++ lib.optional (!isPy3k) futures; ] ++ lib.optional (!isPy3k) futures;
@ -59,8 +29,8 @@ in with py.pkgs; buildPythonApplication rec {
doCheck = false; doCheck = false;
meta = with lib; { meta = with lib; {
homepage = https://github.com/insanum/gcalcli;
description = "CLI for Google Calendar"; description = "CLI for Google Calendar";
homepage = https://github.com/insanum/gcalcli;
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ nocoolnametom ]; maintainers = with maintainers; [ nocoolnametom ];
inherit version; inherit version;