Separate haskell from other packages

4 files changed, 27 insertions, 16 deletions

diff --git a/nix/overlay.nix b/nix/haskell-packages.nix
index dcadf34..b496cd4 100644
--- a/nix/overlay.nix
+++ b/nix/haskell-packages.nix
@@ -47,19 +47,4 @@ in {
       });
     };
   };
-  wemux = super.stdenv.mkDerivation rec {
-    name = "wemux";
-    version = "2020.04.03";
-    src = super.pkgs.fetchFromGitHub {
-      owner = "zolrath";
-      repo = "wemux";
-      rev = "01c6541f8deceff372711241db2a13f21c4b210c";
-      sha256 = "1y962nzvs7sf720pl3wa582l6irxc8vavd0gp4ag4243b2gs4qvm";
-    };
-    installPhase = ''
-      mkdir -p $out/bin
-      cp ${src}/wemux $out/bin
-      chmod +x $out/bin/wemux
-    '';
-  };
 }
diff --git a/nix/nixpkgs.nix b/nix/nixpkgs.nix
index 246b8a8..a5d1640 100644
--- a/nix/nixpkgs.nix
+++ b/nix/nixpkgs.nix
@@ -3,8 +3,10 @@ let
   nixpkgs = import sources.nixpkgs {
     system = "x86_64-linux";
     overlays = [
+      (_: _: { inherit sources; })
       (_: _: { niv = import sources.niv {}; })
-      (import ./overlay.nix)
+      (import ./haskell-packages.nix)
+      (_: pkgs: { wemux = super.callPackage ./wemux.nix {}; })
     ];
   };
 in nixpkgs
diff --git a/nix/sources.json b/nix/sources.json
index 841f308..76ad1f1 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -22,5 +22,17 @@
         "type": "tarball",
         "url": "https://github.com/NixOS/nixpkgs/archive/b0c285807d6a9f1b7562ec417c24fa1a30ecc31a.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "wemux": {
+        "branch": "master",
+        "description": "Multi-User Tmux Made Easy",
+        "homepage": "",
+        "owner": "zolrath",
+        "repo": "wemux",
+        "rev": "01c6541f8deceff372711241db2a13f21c4b210c",
+        "sha256": "1y962nzvs7sf720pl3wa582l6irxc8vavd0gp4ag4243b2gs4qvm",
+        "type": "tarball",
+        "url": "https://github.com/zolrath/wemux/archive/01c6541f8deceff372711241db2a13f21c4b210c.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/nix/wemux.nix b/nix/wemux.nix
new file mode 100644
index 0000000..4972815
--- /dev/null
+++ b/nix/wemux.nix
@@ -0,0 +1,12 @@
+{ sources, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "wemux";
+  version = "2020.04.03";
+  src = sources.wemux;
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ${src}/wemux $out/bin
+    chmod +x $out/bin/wemux
+  '';
+}