From 58890bc80b28ed02e98b21a054849220a69919cb Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 13 Nov 2015 01:07:54 +0100
Subject: l: use new xserver architecture

---
 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 869f808c..844d68a4 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -15,4 +15,7 @@ rec {
   };
   go = callPackage ./go/default.nix {};
   newsbot-js = callPackage ./newsbot-js/default.nix {};
+  xmonad-lass =
+    let src = pkgs.writeNixFromCabal "xmonad-lass.nix" ./xmonad-lass; in
+    pkgs.haskellPackages.callPackage src {};
 }
-- 
cgit v1.2.3


From 07dca519636f07ee4887e14e0e9a9739ec9f8034 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 13 Nov 2015 14:53:26 +0100
Subject: l 5 go -> k 5 go

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

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

diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index 844d68a4..b3857ce9 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -5,15 +5,14 @@ let
 in
 
 rec {
-  bitlbee-dev = callPackage ./bitlbee-dev.nix {};
-  bitlbee-steam = callPackage ./bitlbee-steam.nix { inherit bitlbee-dev; };
-  bitlbee = callPackage ./bitlbee.nix { inherit bitlbee-steam; };
+  #bitlbee-dev = callPackage ./bitlbee-dev.nix {};
+  #bitlbee-steam = callPackage ./bitlbee-steam.nix { inherit bitlbee-dev; };
+  #bitlbee = callPackage ./bitlbee.nix { inherit bitlbee-steam; };
   firefoxPlugins = {
     noscript = callPackage ./firefoxPlugins/noscript.nix {};
     ublock = callPackage ./firefoxPlugins/ublock.nix {};
     vimperator = callPackage ./firefoxPlugins/vimperator.nix {};
   };
-  go = callPackage ./go/default.nix {};
   newsbot-js = callPackage ./newsbot-js/default.nix {};
   xmonad-lass =
     let src = pkgs.writeNixFromCabal "xmonad-lass.nix" ./xmonad-lass; in
-- 
cgit v1.2.3


From 2e2e5196d149379643244f92239f88f5d2eb2237 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 13 Nov 2015 14:56:37 +0100
Subject: l: use bitlbee plugin architecture from nixpkgs

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

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

diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index b3857ce9..2b958291 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -5,9 +5,6 @@ let
 in
 
 rec {
-  #bitlbee-dev = callPackage ./bitlbee-dev.nix {};
-  #bitlbee-steam = callPackage ./bitlbee-steam.nix { inherit bitlbee-dev; };
-  #bitlbee = callPackage ./bitlbee.nix { inherit bitlbee-steam; };
   firefoxPlugins = {
     noscript = callPackage ./firefoxPlugins/noscript.nix {};
     ublock = callPackage ./firefoxPlugins/ublock.nix {};
-- 
cgit v1.2.3