From bb19655339b9a77493f89b9496ade6bce9354327 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 13 Jun 2016 23:01:56 +0200
Subject: l: add and use rs pkg

---
 lass/5pkgs/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/5pkgs/default.nix')

diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index 467867f6..402fd1ff 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -10,6 +10,7 @@
     };
     mk_sql_pair = pkgs.callPackage ./mk_sql_pair/default.nix {};
     mpv-poll = pkgs.callPackage ./mpv-poll/default.nix {};
+    rs = pkgs.callPackage ./rs/default.nix {};
     untilport = pkgs.callPackage ./untilport/default.nix {};
     urban = pkgs.callPackage ./urban/default.nix {};
     xmonad-lass =
-- 
cgit v1.2.3


From 1b8c7bc87ac57a31d2d23aada81fe1d35546ff83 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 21 Jun 2016 15:43:45 +0200
Subject: l 5: use writeHaskell

---
 lass/5pkgs/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'lass/5pkgs/default.nix')

diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index 402fd1ff..73e41790 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -13,9 +13,7 @@
     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 {};
   };
 }
-- 
cgit v1.2.3


From d4546fffdd02402607b4e87d0c4bae87db2beb5c Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 25 Jun 2016 13:18:37 +0200
Subject: l 5: add q

---
 lass/5pkgs/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/5pkgs/default.nix')

diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index 73e41790..0ea7912d 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -10,6 +10,7 @@
     };
     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 {};
-- 
cgit v1.2.3


From 1d071c59ecddb87cd7ba31c1c91edc34506479ad Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 28 Jun 2016 18:10:20 +0200
Subject: l 5: override ejabberd

---
 lass/5pkgs/default.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lass/5pkgs/default.nix')

diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index 0ea7912d..c48188f9 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 {};
-- 
cgit v1.2.3