diff options
| -rw-r--r-- | third_party/lieer/api_client.patch | 20 | ||||
| -rw-r--r-- | third_party/lieer/default.nix | 29 | ||||
| -rw-r--r-- | third_party/lieer/send_scope.patch | 17 | ||||
| -rw-r--r-- | users/tazjin/nixos/frog/default.nix | 3 |
4 files changed, 19 insertions, 50 deletions
diff --git a/third_party/lieer/api_client.patch b/third_party/lieer/api_client.patch deleted file mode 100644 index cbde914a6ba8..000000000000 --- a/third_party/lieer/api_client.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/lieer/remote.py b/lieer/remote.py -index 6e3973a..62728f7 100644 ---- a/lieer/remote.py -+++ b/lieer/remote.py -@@ -25,12 +25,12 @@ class Remote: - # * https://stackoverflow.com/questions/19615372/client-secret-in-oauth-2-0?rq=1 - # - OAUTH2_CLIENT_SECRET = { -- "client_id":"753933720722-ju82fu305lii0v9rdo6mf9hj40l5juv0.apps.googleusercontent.com", -- "project_id":"capable-pixel-160614", -+ "client_id":"${CLIENT_ID}", -+ "project_id":"${PROJECT_ID}", - "auth_uri":"https://accounts.google.com/o/oauth2/auth", - "token_uri":"https://accounts.google.com/o/oauth2/token", - "auth_provider_x509_cert_url":"https://www.googleapis.com/oauth2/v1/certs", -- "client_secret":"8oudEG0Tvb7YI2V0ykp2Pzz9", -+ "client_secret":"${CLIENT_SECRET}", - "redirect_uris":["urn:ietf:wg:oauth:2.0:oob", "http://localhost"] - } - diff --git a/third_party/lieer/default.nix b/third_party/lieer/default.nix index 6dd4cecd1d3f..631be82a8a49 100644 --- a/third_party/lieer/default.nix +++ b/third_party/lieer/default.nix @@ -1,44 +1,21 @@ # Lieer is a small tool to synchronise a Gmail account with a local # maildir. -# -# Lieer is packaged in nixpkgs, but as of 2019-12-23 it is an old -# version using the previous branding (gmailieer). { pkgs, ... }: -# For a variety of reasons (specific to my setup), custom OAuth2 -# scopes are used. -# -# The below client ID is the default for *@tazj.in and is overridden -# in a private repository for my work account. Publishing it here is -# not a security issue. -{ - clientId ? "515965513093-7b4bo4gm0q09ccsmikkuaas9a40j0jcj.apps.googleusercontent.com", - clientSecret ? "3jVbpfT4GmubFD64svctJSdQ", - project ? "tazjins-infrastructure" -}: - -with pkgs; - let - authPatch = runCommand "client_secret.patch" {} '' - export CLIENT_ID='${clientId}' - export CLIENT_SECRET='${clientSecret}' - export PROJECT_ID='${project}' - cat ${./api_client.patch} | ${gettext}/bin/envsubst > $out - ''; + inherit (pkgs) fetchFromGitHub python3Packages; in python3Packages.buildPythonApplication rec { name = "lieer-${version}"; - version = "1.0"; + version = "1.3"; src = fetchFromGitHub { owner = "gauteh"; repo = "lieer"; rev = "v${version}"; - sha256 = "1zzylv8xbcrh34bz0s29dawzcyx39lai8y8wk0bl4x75v1jfynvf"; + sha256 = "12sl7d381l1gjaam419xc8gxmsprxf0hgksz1f974qmmijvr02bh"; }; patches = [ - authPatch ./send_scope.patch ]; diff --git a/third_party/lieer/send_scope.patch b/third_party/lieer/send_scope.patch index c882a79ac518..2f1a59ac88fe 100644 --- a/third_party/lieer/send_scope.patch +++ b/third_party/lieer/send_scope.patch @@ -1,8 +1,18 @@ +From ac7be0f9ad212455d833457bc328ee18eb6a5fdf Mon Sep 17 00:00:00 2001 +From: Vincent Ambo <tazjin@google.com> +Date: Thu, 10 Dec 2020 11:13:56 +0100 +Subject: [PATCH] remoet: Add 'mail.google.com' OAuth scope + +Required for sending emails. +--- + lieer/remote.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/lieer/remote.py b/lieer/remote.py -index 6e3973a..ade1082 100644 +index 9f3e871..6f5a71e 100644 --- a/lieer/remote.py +++ b/lieer/remote.py -@@ -9,7 +9,7 @@ from oauth2client.file import Storage +@@ -26,7 +26,7 @@ from oauth2client.file import Storage from pathlib import Path class Remote: @@ -11,3 +21,6 @@ index 6e3973a..ade1082 100644 APPLICATION_NAME = 'Lieer' CLIENT_SECRET_FILE = None authorized = False +-- +2.29.2.576.ga3fc446d84-goog + diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix index a3e263d095a1..2f0b204a615b 100644 --- a/users/tazjin/nixos/frog/default.nix +++ b/users/tazjin/nixos/frog/default.nix @@ -1,12 +1,11 @@ { depot, lib, ... }: config: let + inherit (depot.third_party) lieer; nixpkgs = import depot.third_party.nixpkgsSrc { config.allowUnfree = true; }; - lieer = depot.third_party.lieer {}; - # add google-c-style here because other machines get it from, eh, # elsewhere. frogEmacs = (depot.users.tazjin.emacs.overrideEmacs(epkgs: epkgs ++ [ |