1 files changed, 41 insertions, 16 deletions

diff --git a/user-profiles/feeds/module.nix b/user-profiles/feeds/module.nix
index 992bfe37..1face90e 100644
--- a/user-profiles/feeds/module.nix
+++ b/user-profiles/feeds/module.nix
@@ -7,30 +7,55 @@ let
 
   configPath = "${config.xdg.configHome}/feeds/notmuchrc";
   databasePath = "${config.xdg.dataHome}/feeds";
-  
-  imm = flakeInputs.imm.defaultPackage.${system}.overrideAttrs (oldAttrs: {
-    buildInputs =
-      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.callCabal2nix "uri-bytestring" (pkgs.fetchFromGitHub {
+
+  imm =
+    let
+      hlib = pkgs.haskell.lib;
+      haskellPackages = pkgs.haskellPackages.override {
+        overrides = finalHaskell: prevHaskell: {
+          uri-bytestring = finalHaskell.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 {
+          }) {};
+          atom-conduit = finalHaskell.callCabal2nix "atom-conduit" (pkgs.fetchFromGitHub {
             owner = "gkleen";
             repo = "atom-conduit";
-            rev = "af33d1162d84f1fca00fe92a2e47f0a1a5275b4b";
-            sha256 = "FbfA4cvF0Z9Q4ethJmXWAQmWdFZNds7XRIMWFXc+ByA=";
+            rev = "022f0182a02373f87c06a0a09817c8c41efe2425";
+            sha256 = "8yEyh3ymqkoM/YP+eBqPq1I5ofzj0Qn7ojL7IWx1DPo=";
+            fetchSubmodules = true;
+          }) {};
+          rss-conduit = finalHaskell.callCabal2nix "rss-condit" (pkgs.fetchFromGitHub {
+            owner = "gkleen";
+            repo = "rss-conduit";
+            rev = "dbb0960a8d3dc519f1607aa0223b3a25a49282ef";
+            sha256 = "Md1XApZWkdv4JvNoaVnjz0S85LbEC6w9U3PUcwXfu94=";
+            fetchSubmodules = true;
+          }) {};
+          beam-core = hlib.doJailbreak (finalHaskell.callCabal2nix "beam-core" "${beamSrc}/beam-core" {});
+          beam-migrate = hlib.doJailbreak (finalHaskell.callCabal2nix "beam-migrate" "${beamSrc}/beam-migrate" {});
+          beam-sqlite = hlib.doJailbreak (finalHaskell.callCabal2nix "beam-sqlite" "${beamSrc}/beam-sqlite" {});
+
+          imm = finalHaskell.callCabal2nix "imm" (pkgs.fetchFromGitHub {
+            owner = "k0ral";
+            repo = "imm";
+            rev = "5033879667264cb44cee65671a66f6aa43f249e7";
+            sha256 = "PG22caLQmAGhLZP49HsazuNd8IFKKaTuhXIQBD8v4Fs=";
             fetchSubmodules = true;
-          }) {})
-        ];
-      in oldDepends ++ newDepends;
-  });
-  immWrapped = pkgs.runCommand "${imm.name}-wrapped-${config.home.username}"
+          }) {};
+        };
+      };
+      beamSrc = pkgs.fetchFromGitHub {
+        owner = "haskell-beam";
+        repo = "beam";
+        rev = "efd464b079755a781c2bb7a2fc030d6c141bbb8a";
+        sha256 = "8nTuBP/vD0L/qMo4h3XNrGZvpIwXuMVdj40j5gvHU6w=";
+        fetchSubmodules = true;
+      };
+    in haskellPackages.imm;
+   immWrapped = pkgs.runCommand "${imm.name}-wrapped-${config.home.username}"
     { nativeBuildInputs = with pkgs; [ makeWrapper imm ];
     } ''
       mkdir -p $out/bin