Merge remote-tracking branch 'prism/master'

1 files changed, 6 insertions, 3 deletions

diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index 467867f63..c48188f9d 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -3,6 +3,9 @@
 {
   nixpkgs.config.packageOverrides = rec {
     acronym = pkgs.callPackage ./acronym/default.nix {};
+    ejabberd = pkgs.callPackage ./ejabberd {
+      erlang = pkgs.erlangR16;
+    };
     firefoxPlugins = {
       noscript = pkgs.callPackage ./firefoxPlugins/noscript.nix {};
       ublock = pkgs.callPackage ./firefoxPlugins/ublock.nix {};
@@ -10,11 +13,11 @@
     };
     mk_sql_pair = pkgs.callPackage ./mk_sql_pair/default.nix {};
     mpv-poll = pkgs.callPackage ./mpv-poll/default.nix {};
+    q = pkgs.callPackage ./q {};
+    rs = pkgs.callPackage ./rs/default.nix {};
     untilport = pkgs.callPackage ./untilport/default.nix {};
     urban = pkgs.callPackage ./urban/default.nix {};
-    xmonad-lass =
-      let src = pkgs.writeNixFromCabal "xmonad-lass.nix" ./xmonad-lass; in
-      pkgs.haskellPackages.callPackage src {};
+    xmonad-lass = import ./xmonad-lass.nix { inherit pkgs; };
     yt-next = pkgs.callPackage ./yt-next/default.nix {};
   };
 }