From d6ff73a867173b7c4d4f0eeeb0adb3e648a55d5b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 5 Sep 2021 13:12:11 +0200
Subject: feeds: ...

---
 user-profiles/feeds/imm-notmuch-insert.py |  4 +++-
 user-profiles/feeds/module.nix            | 11 ++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'user-profiles/feeds')

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():
     msg['Subject'] = callbackMessage['feed_item']['title']
     msg['Item-Identifier'] = f"{callbackMessage['feed_item']['identifier']}"
     for link in callbackMessage['feed_item']['links']:
-        msg.add_header('Link', link['uri'])
+        linkArgs={**link}
+        del linkArgs['uri']
+        msg.add_header('Link', link['uri'], **linkArgs)
     date = None
     if 'date' in callbackMessage['feed_item']:
         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
   imm = flakeInputs.imm.defaultPackage.${system}.overrideAttrs (oldAttrs: {
     buildInputs =
       let
-        oldDepends = filter (attr: if attr ? name then builtins.match "uri-bytestring(-.*)?" attr.name == null else true) (oldAttrs.buildInputs or []);
+        oldDepends = filter (attr: if attr ? name then builtins.match "(uri-bytestring|atom-conduit)(-.*)?" attr.name == null else true) (oldAttrs.buildInputs or []);
         newDepends = [
           (pkgs.haskellPackages.uri-bytestring.overrideAttrs (_: {
             src = pkgs.fetchFromGitHub {
@@ -22,6 +22,15 @@ let
               fetchSubmodules = true;
             };
           }))
+          (pkgs.haskellPackages.atom-conduit.overrideAttrs (_: {
+            src = pkgs.fetchFromGitHub {
+              owner = "gkleen";
+              repo = "atom-conduit";
+              rev = "af33d1162d84f1fca00fe92a2e47f0a1a5275b4b";
+              sha256 = "FbfA4cvF0Z9Q4ethJmXWAQmWdFZNds7XRIMWFXc+ByA=";
+              fetchSubmodules = true;
+            };
+          }))
         ];
       in oldDepends ++ newDepends;
   });
-- 
cgit v1.2.3