diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2021-09-05 13:12:11 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2021-09-05 13:12:11 +0200 |
commit | d6ff73a867173b7c4d4f0eeeb0adb3e648a55d5b (patch) | |
tree | 09428e7b8dd94bb4cd340b3eaf53a054cdf8d2a4 | |
parent | 121f0f4ee93b44e6bf94e166c0fbd9448469ba3b (diff) | |
download | nixos-d6ff73a867173b7c4d4f0eeeb0adb3e648a55d5b.tar nixos-d6ff73a867173b7c4d4f0eeeb0adb3e648a55d5b.tar.gz nixos-d6ff73a867173b7c4d4f0eeeb0adb3e648a55d5b.tar.bz2 nixos-d6ff73a867173b7c4d4f0eeeb0adb3e648a55d5b.tar.xz nixos-d6ff73a867173b7c4d4f0eeeb0adb3e648a55d5b.zip |
feeds: ...
-rw-r--r-- | user-profiles/feeds/imm-notmuch-insert.py | 4 | ||||
-rw-r--r-- | user-profiles/feeds/module.nix | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/user-profiles/feeds/imm-notmuch-insert.py b/user-profiles/feeds/imm-notmuch-insert.py index ba29ce5b..bd22fc85 100644 --- a/user-profiles/feeds/imm-notmuch-insert.py +++ b/user-profiles/feeds/imm-notmuch-insert.py | |||
@@ -28,7 +28,9 @@ def main(): | |||
28 | msg['Subject'] = callbackMessage['feed_item']['title'] | 28 | msg['Subject'] = callbackMessage['feed_item']['title'] |
29 | msg['Item-Identifier'] = f"{callbackMessage['feed_item']['identifier']}" | 29 | msg['Item-Identifier'] = f"{callbackMessage['feed_item']['identifier']}" |
30 | for link in callbackMessage['feed_item']['links']: | 30 | for link in callbackMessage['feed_item']['links']: |
31 | msg.add_header('Link', link['uri']) | 31 | linkArgs={**link} |
32 | del linkArgs['uri'] | ||
33 | msg.add_header('Link', link['uri'], **linkArgs) | ||
32 | date = None | 34 | date = None |
33 | if 'date' in callbackMessage['feed_item']: | 35 | if 'date' in callbackMessage['feed_item']: |
34 | date = isoparse(callbackMessage['feed_item']['date']) | 36 | date = isoparse(callbackMessage['feed_item']['date']) |
diff --git a/user-profiles/feeds/module.nix b/user-profiles/feeds/module.nix index 9f7bcf9e..8008a4b8 100644 --- a/user-profiles/feeds/module.nix +++ b/user-profiles/feeds/module.nix | |||
@@ -11,7 +11,7 @@ let | |||
11 | imm = flakeInputs.imm.defaultPackage.${system}.overrideAttrs (oldAttrs: { | 11 | imm = flakeInputs.imm.defaultPackage.${system}.overrideAttrs (oldAttrs: { |
12 | buildInputs = | 12 | buildInputs = |
13 | let | 13 | let |
14 | oldDepends = filter (attr: if attr ? name then builtins.match "uri-bytestring(-.*)?" attr.name == null else true) (oldAttrs.buildInputs or []); | 14 | oldDepends = filter (attr: if attr ? name then builtins.match "(uri-bytestring|atom-conduit)(-.*)?" attr.name == null else true) (oldAttrs.buildInputs or []); |
15 | newDepends = [ | 15 | newDepends = [ |
16 | (pkgs.haskellPackages.uri-bytestring.overrideAttrs (_: { | 16 | (pkgs.haskellPackages.uri-bytestring.overrideAttrs (_: { |
17 | src = pkgs.fetchFromGitHub { | 17 | src = pkgs.fetchFromGitHub { |
@@ -22,6 +22,15 @@ let | |||
22 | fetchSubmodules = true; | 22 | fetchSubmodules = true; |
23 | }; | 23 | }; |
24 | })) | 24 | })) |
25 | (pkgs.haskellPackages.atom-conduit.overrideAttrs (_: { | ||
26 | src = pkgs.fetchFromGitHub { | ||
27 | owner = "gkleen"; | ||
28 | repo = "atom-conduit"; | ||
29 | rev = "af33d1162d84f1fca00fe92a2e47f0a1a5275b4b"; | ||
30 | sha256 = "FbfA4cvF0Z9Q4ethJmXWAQmWdFZNds7XRIMWFXc+ByA="; | ||
31 | fetchSubmodules = true; | ||
32 | }; | ||
33 | })) | ||
25 | ]; | 34 | ]; |
26 | in oldDepends ++ newDepends; | 35 | in oldDepends ++ newDepends; |
27 | }); | 36 | }); |