Merge remote-tracking branch 'lass/master'

4 files changed, 50 insertions, 2 deletions

diff --git a/krebs/5pkgs/haskell/X11-aeson.nix b/krebs/5pkgs/haskell/X11-aeson.nix
new file mode 100644
index 000000000..7db6c28a8
--- /dev/null
+++ b/krebs/5pkgs/haskell/X11-aeson.nix
@@ -0,0 +1,13 @@
+{ mkDerivation, aeson, base, fetchgit, stdenv, X11 }:
+mkDerivation {
+  pname = "X11-aeson";
+  version = "1.0.0";
+  src = fetchgit {
+    url = "https://cgit.krebsco.de/X11-aeson";
+    sha256 = "0y9nvssqpvqgl46g7nz9738l8jmpa7an8r3am3qaqcvmvzgwxh0d";
+    rev = "c0a70a62513baf2b437db4ebe3e5a32e3cfa5905";
+    fetchSubmodules = true;
+  };
+  libraryHaskellDepends = [ aeson base X11 ];
+  license = stdenv.lib.licenses.mit;
+}
diff --git a/krebs/5pkgs/haskell/brockman/default.nix b/krebs/5pkgs/haskell/brockman/default.nix
index 92051a025..d0cd6119e 100644
--- a/krebs/5pkgs/haskell/brockman/default.nix
+++ b/krebs/5pkgs/haskell/brockman/default.nix
@@ -7,12 +7,12 @@
 }:
 mkDerivation rec {
   pname = "brockman";
-  version = "3.4.0";
+  version = "3.4.3";
   src = fetchFromGitHub {
     owner = "kmein";
     repo = "brockman";
     rev = version;
-    sha256 = "02nval6a9xcddj6znzxvcb8g6klzjydj1lb4ych64i9mr4a8jvic";
+    sha256 = "0s8rvsj5m70wijl8j00fisz6c1kms7kx12lxfgk63mrx2ldp1fb4";
   };
   isLibrary = false;
   isExecutable = true;
diff --git a/krebs/5pkgs/haskell/hack.nix b/krebs/5pkgs/haskell/hack.nix
new file mode 100644
index 000000000..4e157107e
--- /dev/null
+++ b/krebs/5pkgs/haskell/hack.nix
@@ -0,0 +1,22 @@
+{ mkDerivation, base, blessings, containers, data-default, fetchgit
+, lens, mtl, old-locale, process, scanner, stdenv, time, unix
+, zippers
+}:
+mkDerivation {
+  pname = "hack";
+  version = "1.0.0";
+  src = fetchgit {
+    url = "https://cgit.krebsco.de/hack";
+    sha256 = "0hi6frpnxbg3h6s7gd48ri57jc226qycy4rnhmpzpq195xf8y3pf";
+    rev = "cb004b2e5f0fce6cea8d54e60558a1c1904dbe39";
+    fetchSubmodules = true;
+  };
+  isLibrary = true;
+  isExecutable = true;
+  libraryHaskellDepends = [ base ];
+  executableHaskellDepends = [
+    base blessings containers data-default lens mtl old-locale process
+    scanner time unix zippers
+  ];
+  license = stdenv.lib.licenses.mit;
+}
diff --git a/krebs/5pkgs/haskell/xmonad-aeson.nix b/krebs/5pkgs/haskell/xmonad-aeson.nix
new file mode 100644
index 000000000..3fccab469
--- /dev/null
+++ b/krebs/5pkgs/haskell/xmonad-aeson.nix
@@ -0,0 +1,13 @@
+{ mkDerivation, aeson, base, fetchgit, stdenv, X11-aeson, xmonad }:
+mkDerivation {
+  pname = "xmonad-aeson";
+  version = "1.0.0";
+  src = fetchgit {
+    url = "https://cgit.krebsco.de/xmonad-aeson";
+    sha256 = "0l1gna6p1498vzm6kj0ywj0i7775mz5n7k9nymwggvfb1pyxv3h9";
+    rev = "a95f652b150f17db3f2439214a6346335d6d8d89";
+    fetchSubmodules = true;
+  };
+  libraryHaskellDepends = [ aeson base X11-aeson xmonad ];
+  license = stdenv.lib.licenses.mit;
+}