1 files changed, 8 insertions, 46 deletions
diff --git a/default.nix b/default.nix
index 02d46e1..7fe02b6 100644
--- a/default.nix
+++ b/default.nix
@@ -1,52 +1,14 @@
-{ pkgs ? import sources.nixpkgs { }
+{ pkgs ? import sources.nixpkgs {
+  overlays = [
+    (import "${sources.sensors}/pkgs")
+    (import "${sources.sh}/pkgs")
+    (import ./pkgs)
+  ];
+  }
 , sources ? import ./nix/sources.nix
 }:
 let
-  haskellPackages = pkgs.haskellPackages.override {
-    overrides = self: super: {
-      astatusbar = (self.callCabal2nix "astatusbar" ./. { }).overrideAttrs (oldAttrs: {
-        nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [ pkgs.installShellFiles ];
-        postInstall = oldAttrs.postInstall or "" + ''
-          exe=${oldAttrs.pname}
-          installShellCompletion --cmd $exe  \
-            --bash <($out/bin/$exe --bash-completion-script $out/bin/$exe) \
-            --fish <($out/bin/$exe --fish-completion-script $out/bin/$exe) \
-            --zsh  <($out/bin/$exe --zsh-completion-script $out/bin/$exe)
-        '';
-      });
-      sensors = pkgs.haskell.lib.dontCheck (self.callCabal2nix "sensors" sources.sensors { });
-      sh = pkgs.haskell.lib.dontCheck (self.callCabal2nix "sh" sources.sh { });
-      statvfs = pkgs.haskell.lib.markUnbroken (super.statvfs.overrideAttrs (oldAtts: {
-        patches = [
-          (pkgs.writers.writeText "statvfs.patch" ''
-            diff --git a/Setup.hs b/Setup.hs
-            index 7cf9bfd..54f57d6 100644
-            --- a/Setup.hs
-            +++ b/Setup.hs
-            @@ -3,4 +3,4 @@ module Main (main) where
-             import Distribution.Simple
- 
-             main :: IO ()
-            -main = defaultMainWithHooks defaultUserHooks
-            +main = defaultMainWithHooks autoconfUserHooks
-          '')
-        ];
-      }));
-      # XXX we don't need to depend on patched X11 anymore
-      X11 = (self.callCabal2nix "X11"
-        (pkgs.fetchFromGitHub {
-          owner = "aforemny";
-          repo = "X11";
-          rev = "70d7a6fba00d4ffe65db90cd3a2e0883ca690a88";
-          hash = "sha256-PsRtqaTyo+z8uPpsr7G3a0WF3Wh1NTWumu0rFlkLJMM=";
-        })
-        { }).overrideAttrs (oldAttrs: {
-        preConfigure = oldAttrs.preConfigure or "" + ''
-          ${pkgs.autoconf}/bin/autoreconf
-        '';
-      });
-    };
-  };
+  inherit (pkgs) haskellPackages;
 in
 rec {
   inherit haskellPackages;