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 869f808ce..844d68a45 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.3.1


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

---
 krebs/5pkgs/go/default.nix  | 57 +++++++++++++++++++++++++++++++++++++++++++++
 krebs/5pkgs/go/packages.nix | 44 ++++++++++++++++++++++++++++++++++
 lass/5pkgs/default.nix      |  7 +++---
 lass/5pkgs/go/default.nix   | 57 ---------------------------------------------
 lass/5pkgs/go/packages.nix  | 44 ----------------------------------
 5 files changed, 104 insertions(+), 105 deletions(-)
 create mode 100644 krebs/5pkgs/go/default.nix
 create mode 100644 krebs/5pkgs/go/packages.nix
 delete mode 100644 lass/5pkgs/go/default.nix
 delete mode 100644 lass/5pkgs/go/packages.nix

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

diff --git a/krebs/5pkgs/go/default.nix b/krebs/5pkgs/go/default.nix
new file mode 100644
index 000000000..9dd166adc
--- /dev/null
+++ b/krebs/5pkgs/go/default.nix
@@ -0,0 +1,57 @@
+{ stdenv, makeWrapper, lib, buildEnv, fetchgit, nodePackages, nodejs }:
+
+with lib;
+
+let
+  np = nodePackages.override {
+    generated = ./packages.nix;
+    self = np;
+  };
+
+  node_env = buildEnv {
+    name = "node_env";
+    paths = [
+      np.redis
+      np."formidable"
+    ];
+    pathsToLink = [ "/lib" ];
+    ignoreCollisions = true;
+  };
+
+in nodePackages.buildNodePackage {
+  name = "go";
+
+  src = fetchgit {
+    url = "http://cgit.echelon/go/";
+    rev = "05d02740e0adbb36cc461323647f0c1e7f493156";
+    sha256 = "6015c9a93317375ae8099c7ab982df0aa93a59ec2b48972e253887bb6ca0004f";
+  };
+
+  phases = [
+    "unpackPhase"
+    "installPhase"
+  ];
+
+  deps = (filter (v: nixType v == "derivation") (attrValues np));
+
+  buildInputs = [
+    nodejs
+    makeWrapper
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+
+    cp index.js $out/
+    cat > $out/go << EOF
+      ${nodejs}/bin/node $out/index.js
+    EOF
+    chmod +x $out/go
+
+    wrapProgram $out/go \
+      --prefix NODE_PATH : ${node_env}/lib/node_modules
+
+     ln -s $out/go /$out/bin/go
+  '';
+
+}
diff --git a/krebs/5pkgs/go/packages.nix b/krebs/5pkgs/go/packages.nix
new file mode 100644
index 000000000..9acfd7658
--- /dev/null
+++ b/krebs/5pkgs/go/packages.nix
@@ -0,0 +1,44 @@
+{ self, fetchurl, fetchgit ? null, lib }:
+
+{
+  by-spec."formidable"."*" =
+    self.by-version."formidable"."1.0.17";
+  by-version."formidable"."1.0.17" = self.buildNodePackage {
+    name = "formidable-1.0.17";
+    version = "1.0.17";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz";
+      name = "formidable-1.0.17.tgz";
+      sha1 = "ef5491490f9433b705faa77249c99029ae348559";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "formidable" = self.by-version."formidable"."1.0.17";
+  by-spec."redis"."*" =
+    self.by-version."redis"."2.1.0";
+  by-version."redis"."2.1.0" = self.buildNodePackage {
+    name = "redis-2.1.0";
+    version = "2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/redis/-/redis-2.1.0.tgz";
+      name = "redis-2.1.0.tgz";
+      sha1 = "38acb208f90750250f9451219b73ff08ae907f94";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "redis" = self.by-version."redis"."2.1.0";
+}
diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index 844d68a45..b3857ce97 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
diff --git a/lass/5pkgs/go/default.nix b/lass/5pkgs/go/default.nix
deleted file mode 100644
index 9dd166adc..000000000
--- a/lass/5pkgs/go/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv, makeWrapper, lib, buildEnv, fetchgit, nodePackages, nodejs }:
-
-with lib;
-
-let
-  np = nodePackages.override {
-    generated = ./packages.nix;
-    self = np;
-  };
-
-  node_env = buildEnv {
-    name = "node_env";
-    paths = [
-      np.redis
-      np."formidable"
-    ];
-    pathsToLink = [ "/lib" ];
-    ignoreCollisions = true;
-  };
-
-in nodePackages.buildNodePackage {
-  name = "go";
-
-  src = fetchgit {
-    url = "http://cgit.echelon/go/";
-    rev = "05d02740e0adbb36cc461323647f0c1e7f493156";
-    sha256 = "6015c9a93317375ae8099c7ab982df0aa93a59ec2b48972e253887bb6ca0004f";
-  };
-
-  phases = [
-    "unpackPhase"
-    "installPhase"
-  ];
-
-  deps = (filter (v: nixType v == "derivation") (attrValues np));
-
-  buildInputs = [
-    nodejs
-    makeWrapper
-  ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-
-    cp index.js $out/
-    cat > $out/go << EOF
-      ${nodejs}/bin/node $out/index.js
-    EOF
-    chmod +x $out/go
-
-    wrapProgram $out/go \
-      --prefix NODE_PATH : ${node_env}/lib/node_modules
-
-     ln -s $out/go /$out/bin/go
-  '';
-
-}
diff --git a/lass/5pkgs/go/packages.nix b/lass/5pkgs/go/packages.nix
deleted file mode 100644
index 9acfd7658..000000000
--- a/lass/5pkgs/go/packages.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ self, fetchurl, fetchgit ? null, lib }:
-
-{
-  by-spec."formidable"."*" =
-    self.by-version."formidable"."1.0.17";
-  by-version."formidable"."1.0.17" = self.buildNodePackage {
-    name = "formidable-1.0.17";
-    version = "1.0.17";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz";
-      name = "formidable-1.0.17.tgz";
-      sha1 = "ef5491490f9433b705faa77249c99029ae348559";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "formidable" = self.by-version."formidable"."1.0.17";
-  by-spec."redis"."*" =
-    self.by-version."redis"."2.1.0";
-  by-version."redis"."2.1.0" = self.buildNodePackage {
-    name = "redis-2.1.0";
-    version = "2.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/redis/-/redis-2.1.0.tgz";
-      name = "redis-2.1.0.tgz";
-      sha1 = "38acb208f90750250f9451219b73ff08ae907f94";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "redis" = self.by-version."redis"."2.1.0";
-}
-- 
cgit v1.3.1


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/2configs/bitlbee.nix    | 16 ++++------
 lass/5pkgs/bitlbee-dev.nix   | 20 -------------
 lass/5pkgs/bitlbee-steam.nix | 31 -------------------
 lass/5pkgs/bitlbee.nix       | 71 --------------------------------------------
 lass/5pkgs/default.nix       |  3 --
 5 files changed, 6 insertions(+), 135 deletions(-)
 delete mode 100644 lass/5pkgs/bitlbee-dev.nix
 delete mode 100644 lass/5pkgs/bitlbee-steam.nix
 delete mode 100644 lass/5pkgs/bitlbee.nix

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

diff --git a/lass/2configs/bitlbee.nix b/lass/2configs/bitlbee.nix
index fa14c7fea..b23628dc5 100644
--- a/lass/2configs/bitlbee.nix
+++ b/lass/2configs/bitlbee.nix
@@ -1,16 +1,12 @@
 { config, pkgs, ... }:
 
-let
-  lpkgs = import ../5pkgs { inherit pkgs; };
-in {
-
-  imports = [
-    ../3modules/bitlbee.nix
-  ];
-
-  lass.bitlbee = {
+{
+  services.bitlbee = {
     enable = true;
-    bitlbeePkg = lpkgs.bitlbee;
     portNumber = 6666;
+    plugins = [
+      pkgs.bitlbee-facebook
+      pkgs.bitlbee-steam
+    ];
   };
 }
diff --git a/lass/5pkgs/bitlbee-dev.nix b/lass/5pkgs/bitlbee-dev.nix
deleted file mode 100644
index dd129591e..000000000
--- a/lass/5pkgs/bitlbee-dev.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python }:
-
-stdenv.mkDerivation rec {
-  name = "bitlbee-3.4.1";
-
-  src = fetchurl {
-    url = "mirror://bitlbee/src/${name}.tar.gz";
-    sha256 = "1qf0ypa9ba5jvsnpg9slmaran16hcc5fnfzbb1sdch1hjhchn2jh";
-  };
-
-  buildInputs = [ gnutls glib pkgconfig libotr python ];
-
-  buildPhase = "";
-
-  installPhase = ''
-    make install-dev
-  '';
-
-}
-
diff --git a/lass/5pkgs/bitlbee-steam.nix b/lass/5pkgs/bitlbee-steam.nix
deleted file mode 100644
index d869eaac5..000000000
--- a/lass/5pkgs/bitlbee-steam.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchgit, autoconf, automake, bitlbee-dev, glib, libgcrypt, libtool, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "bitlbee-steam-1.3.1";
-
-  src = fetchgit {
-    url = "https://github.com/jgeboski/bitlbee-steam";
-    rev = "439d777c7e8d06712ffc15c3e51d61799f4c0d0c";
-    sha256 = "493924da1083a3b23073c595a9e1989a7ae09a196524ad66ca99c4d8ccc20d2a";
-  };
-
-  buildInputs = [
-    autoconf
-    automake
-    bitlbee-dev
-    glib
-    libgcrypt
-    libtool
-    pkgconfig
-  ];
-
-  configurePhase = ''
-    ./autogen.sh
-  '';
-
-  installPhase = ''
-    mkdir -p $out
-    cp steam/.libs/steam.la $out/
-    cp steam/.libs/steam.so $out/
-  '';
-}
diff --git a/lass/5pkgs/bitlbee.nix b/lass/5pkgs/bitlbee.nix
deleted file mode 100644
index 2a5a8d86d..000000000
--- a/lass/5pkgs/bitlbee.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python
-  , bitlbee-facebook ? null
-  , bitlbee-steam ? null
-}:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
-  name = "bitlbee-3.4.1";
-
-  src = fetchurl {
-    url = "mirror://bitlbee/src/${name}.tar.gz";
-    sha256 = "1qf0ypa9ba5jvsnpg9slmaran16hcc5fnfzbb1sdch1hjhchn2jh";
-  };
-
-
-  buildInputs = [ gnutls glib pkgconfig libotr python ]
-    ++ optional doCheck check;
-
-  configureFlags = [
-    "--gcov=1"
-    "--otr=1"
-    "--ssl=gnutls"
-  ];
-
-  postBuild = ''
-    ${if (bitlbee-steam != null) then
-      ''
-        mkdir -p $out/lib/bitlbee/
-        find ${bitlbee-steam}
-        cp ${bitlbee-steam}/* $out/lib/bitlbee/
-      ''
-    else
-      ""
-    }
-  '';
-    #${concatMapStringsSep "\n" ([] ++
-    #  (if (bitlbee-facebook != null) then
-    #    "cp ${bitlbee-faceook}/* $out/"
-    #  else
-    #    ""
-    #  ) ++
-    #  (if (bitlbee-steam != null) then
-    #    "cp ${bitlbee-steam}/* $out/"
-    #  else
-    #    ""
-    #  )
-    #)}
-
-  doCheck = true;
-
-  meta = {
-    description = "IRC instant messaging gateway";
-
-    longDescription = ''
-      BitlBee brings IM (instant messaging) to IRC clients.  It's a
-      great solution for people who have an IRC client running all the
-      time and don't want to run an additional MSN/AIM/whatever
-      client.
-
-      BitlBee currently supports the following IM networks/protocols:
-      XMPP/Jabber (including Google Talk), MSN Messenger, Yahoo!
-      Messenger, AIM and ICQ.
-    '';
-
-    homepage = http://www.bitlbee.org/;
-    license = licenses.gpl2Plus;
-
-    maintainers = with maintainers; [ wkennington pSub ];
-    platforms = platforms.gnu;  # arbitrary choice
-  };
-}
diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index b3857ce97..2b9582912 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.3.1