9 files changed, 134 insertions, 2 deletions

diff --git a/.gitmodules b/.gitmodules
index 617dad33..ecc16ee7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,12 @@
 [submodule "trivmix"]
         path = trivmix
         url = git://git.yggdrasil.li/trivmix
+[submodule "beuteltier"]
+        path = beuteltier
+        url = git://git.yggdrasil.li/beuteltier
+[submodule "opossum"]
+        path = opossum
+        url = git://git.yggdrasil.li/opossum
+[submodule "wombat"]
+        path = wombat
+        url = git://git.yggdrasil.li/wombat
diff --git a/beuteltier b/beuteltier
new file mode 160000
+Subproject c2bf68491c6e76c3eeed135ceb1087606a5f170
diff --git a/custom/beuteltier.nix b/custom/beuteltier.nix
new file mode 100644
index 00000000..0df82948
--- /dev/null
+++ b/custom/beuteltier.nix
@@ -0,0 +1,30 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, dataDefault, filepath, lenses, mtl, tar, text
+, transformers, yaml, zlib, cryptohash, time, base16Bytestring
+, attoparsecExpr, caseInsensitive, timeparsers
+, fetchgit
+}:
+
+cabal.mkDerivation (self: {
+  pname = "beuteltier";
+  version = "5.1.3";
+  #src = ./.;
+  src = fetchgit {
+    url = git://git.yggdrasil.li/beuteltier;
+    # nix-shell -p nix-prefetch-scripts --command 'nix-prefetch-git git://git.yggdrasil.li/beuteltier' 2>&1 | grep -E '(git revision|hash) is ' | sed -r 's/git revision is /rev = "/' | sed -r 's/hash is /sha256 = "/' | sed -r 's/$/";/'
+    rev = "8c7be69fa083176f7566cce7c6e2993b7a47b6aa";
+    sha256 = "964d33d7e8a170f1a9aa9e48caceb633ce4f748ea747d73069641775b6988d7a";
+  };
+  buildDepends = [
+    aeson dataDefault filepath lenses mtl tar text transformers yaml
+    zlib cryptohash time base16Bytestring attoparsecExpr caseInsensitive
+    timeparsers
+  ];
+  meta = {
+    homepage = "git://git.yggdrasil.li/beuteltier";
+    description = "Accessor library for \"Beutel\" (Bag) - a backstore (directory) containing tracked objects (.tgz files with a yaml manifest inside)";
+    license = self.stdenv.lib.licenses.publicDomain;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/custom/opossum-wrapper.nix b/custom/opossum-wrapper.nix
new file mode 100644
index 00000000..2a2a1bff
--- /dev/null
+++ b/custom/opossum-wrapper.nix
@@ -0,0 +1,20 @@
+{ stdenv
+, ghcWithPackages
+, makeWrapper
+, opossum
+, additionalPackages ? (p: [])
+}:
+
+let
+  myEnv = ghcWithPackages (p: with p; [ beuteltier opossum ] ++ additionalPackages p);
+in stdenv.mkDerivation {
+  name = "opossum-wrapper";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildCommand = ''
+    mkdir -p $out/bin
+    makeWrapper ${opossum}/bin/opossum $out/bin/opossum \
+      --set NIX_GHC ${myEnv}/bin/ghc
+  '';
+}
diff --git a/custom/opossum.nix b/custom/opossum.nix
new file mode 100644
index 00000000..e55086c2
--- /dev/null
+++ b/custom/opossum.nix
@@ -0,0 +1,30 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, beuteltier, dataDefault, dyre, exceptions, feed, filepath
+, httpClient, httpClientTls, lenses, mtl, shellMonad, tagged, text
+, time, transformers, hxt, caseInsensitive, attoparsec
+, fetchgit
+}:
+
+cabal.mkDerivation (self: {
+  pname = "opossum";
+  version = "1.1.0";
+  src = fetchgit {
+    url = git://git.yggdrasil.li/opossum;
+    # nix-shell -p nix-prefetch-scripts --command 'nix-prefetch-git git://git.yggdrasil.li/opossum' 2>&1 | grep -E '(git revision|hash) is ' | sed -r 's/git revision is /rev = "/' | sed -r 's/hash is /sha256 = "/' | sed -r 's/$/";/'
+    rev = "47aaa1d9e622c12a6f911454e111e8228c9f592c";
+    sha256 = "18fe08a902778bf70c88954fcf659ae196da7a1ee7841344624b15bf30ad3910";
+  };
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    beuteltier dataDefault dyre exceptions feed filepath httpClient
+    httpClientTls lenses mtl shellMonad tagged text time transformers
+    hxt caseInsensitive attoparsec
+  ];
+  meta = {
+    description = "A webscraper for beuteltier";
+    license = self.stdenv.lib.licenses.publicDomain;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/custom/wombat.nix b/custom/wombat.nix
new file mode 100644
index 00000000..baeac700
--- /dev/null
+++ b/custom/wombat.nix
@@ -0,0 +1,29 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, beuteltier, filepath, lenses, mtl
+, optparseApplicative, text, time, transformers
+, unorderedContainers, vector
+, fetchgit
+}:
+
+cabal.mkDerivation (self: {
+  pname = "wombat";
+  version = "0.4.0";
+  src = fetchgit {
+    url = git://git.yggdrasil.li/wombat;
+    # nix-shell -p nix-prefetch-scripts --command 'nix-prefetch-git git://git.yggdrasil.li/wombat' 2>&1 | grep -E '(git revision|hash) is ' | sed -r 's/git revision is /rev = "/' | sed -r 's/hash is /sha256 = "/' | sed -r 's/$/";/'
+    rev = "8f1b1ed05d12a0f5f47a7834d4878d2a3e8014d3";
+    sha256 = "f441971623f3f2a35df9feae0ac927b5447d62fede33fd67bb54baeb08468a51";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    aeson beuteltier filepath lenses mtl optparseApplicative text time
+    transformers unorderedContainers vector
+  ];
+  meta = {
+    description = "A Beuteltier";
+    license = self.stdenv.lib.licenses.publicDomain;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/opossum b/opossum
new file mode 160000
+Subproject 49eec05199878161d59ef294c96bf7561efc842
diff --git a/users/gkleen@bragi.nix b/users/gkleen@bragi.nix
index 326280f3..57786450 100644
--- a/users/gkleen@bragi.nix
+++ b/users/gkleen@bragi.nix
@@ -3,7 +3,7 @@
     mpv = let mpv = pkgs.mpv.override { youtubeSupport = true; theoraSupport = true; }; in pkgs.stdenv.mkDerivation {
       name = "mpv-wrapper";
       src = mpv;
-      unpackPhase = "cat";
+      unpackPhase = "true";
       buildInputs = [ pkgs.makeWrapper pkgs.rsync ];
       installPhase = ''
         mkdir -p $out
@@ -17,7 +17,7 @@
     jackmeter = let jackmeter = pkgs.jackmeter.override {}; in pkgs.stdenv.mkDerivation {
       name = "jackmeter-wrapper";
       src = jackmeter;
-      unpackPhase = "cat";
+      unpackPhase = "true";
       buildInputs = [ pkgs.makeWrapper pkgs.rsync ];
       installPhase = ''
         mkdir -p $out
@@ -28,5 +28,19 @@
           --run "umask 0"
       '';
     };
+    myHaskellPackages = pkgs.recurseIntoAttrs {
+      pkgs.haskellPackages.override {
+        extension = self: super: let
+          callPackage = pkgs.lib.callPackageWith self;
+        in
+          beuteltier = callPackage custom/beuteltier.nix { fetchgit = pkgs.fetchgit; };
+          wombat = callPackage custom/wombat.nix { fetchgit = pkgs.fetchgit; };
+          opossum = callPackage custom/opossum.nix { fetchgit = pkgs.fetchgit; };
+          opossumWrapper = callPackage custom/opossum-wrapper.nix {
+            stdenv = pkgs.stdenv;
+            makeWrapper = pkgs.stdenv.makeWrapper;
+          };
+      };
+    };
   };
 }
diff --git a/wombat b/wombat
new file mode 160000
+Subproject f9689918eb8304591f4b29975868eca19f8bde1