From 87589c89dc246a239d59d63c8fffac49eb89af2f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 5 Sep 2021 13:39:36 +0200
Subject: feeds: ...

---
 user-profiles/feeds/module.nix | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

(limited to 'user-profiles')

diff --git a/user-profiles/feeds/module.nix b/user-profiles/feeds/module.nix
index 8008a4b8..992bfe37 100644
--- a/user-profiles/feeds/module.nix
+++ b/user-profiles/feeds/module.nix
@@ -13,24 +13,20 @@ let
       let
         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 {
-              owner = "gkleen";
-              repo = "uri-bytestring";
-              rev = "5f7f32c8274bc4d1b81d99582f5148fe3e8b637e";
-              sha256 = "XLanwyCDIlMuOkpE5LbTNOBfL+1kZX+URfj9Bhs1Nsc=";
-              fetchSubmodules = true;
-            };
-          }))
-          (pkgs.haskellPackages.atom-conduit.overrideAttrs (_: {
-            src = pkgs.fetchFromGitHub {
-              owner = "gkleen";
-              repo = "atom-conduit";
-              rev = "af33d1162d84f1fca00fe92a2e47f0a1a5275b4b";
-              sha256 = "FbfA4cvF0Z9Q4ethJmXWAQmWdFZNds7XRIMWFXc+ByA=";
-              fetchSubmodules = true;
-            };
-          }))
+          (pkgs.haskellPackages.callCabal2nix "uri-bytestring" (pkgs.fetchFromGitHub {
+            owner = "gkleen";
+            repo = "uri-bytestring";
+            rev = "5f7f32c8274bc4d1b81d99582f5148fe3e8b637e";
+            sha256 = "XLanwyCDIlMuOkpE5LbTNOBfL+1kZX+URfj9Bhs1Nsc=";
+            fetchSubmodules = true;
+          }) {})
+          (pkgs.haskellPackages.callCabal2nix "atom-conduit" (pkgs.fetchFromGitHub {
+            owner = "gkleen";
+            repo = "atom-conduit";
+            rev = "af33d1162d84f1fca00fe92a2e47f0a1a5275b4b";
+            sha256 = "FbfA4cvF0Z9Q4ethJmXWAQmWdFZNds7XRIMWFXc+ByA=";
+            fetchSubmodules = true;
+          }) {})
         ];
       in oldDepends ++ newDepends;
   });
-- 
cgit v1.2.3