From d5dc5767ca1e73490f399f69d9376604f666cf23 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 7 Jun 2015 22:40:53 +0200
Subject: Switched custom derivitions to submodules

---
 .gitmodules            |  3 +++
 bragi.nix              |  2 +-
 custom/trivmix.nix     |  1 +
 customized/trivmix.nix | 25 -------------------------
 trivmix                |  1 +
 5 files changed, 6 insertions(+), 26 deletions(-)
 create mode 100644 .gitmodules
 create mode 120000 custom/trivmix.nix
 delete mode 100644 customized/trivmix.nix
 create mode 160000 trivmix

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..617dad33
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "trivmix"]
+	path = trivmix
+	url = git://git.yggdrasil.li/trivmix
diff --git a/bragi.nix b/bragi.nix
index ea074065..8376d70a 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -25,7 +25,7 @@
 
   nixpkgs.config.packageOverrides = pkgs:
     {
-      trivmix = let trivmix = pkgs.haskellPackages.callPackage ./customized/trivmix.nix {}; in
+      trivmix = let trivmix = pkgs.haskellPackages.callPackage ./custom/trivmix.nix {}; in
         pkgs.stdenv.mkDerivation {
           name = "trivmix-wrapper";
           nativeBuildInputs = [ pkgs.makeWrapper ];
diff --git a/custom/trivmix.nix b/custom/trivmix.nix
new file mode 120000
index 00000000..c968101a
--- /dev/null
+++ b/custom/trivmix.nix
@@ -0,0 +1 @@
+../trivmix/trivmix.nix
\ No newline at end of file
diff --git a/customized/trivmix.nix b/customized/trivmix.nix
deleted file mode 100644
index a39cf1b0..00000000
--- a/customized/trivmix.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, hinotify, jack, optparseApplicative
-, transformers, explicitException, process
-, fetchgit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "trivmix";
-  version = "1.0.0";
-  src = fetchgit {
-    url = git://git.yggdrasil.li/trivmix;
-    rev = "c51b5c819872b32c354ac7e48261f84ff6a07161";
-    sha256 = "f18bc1b6a4af3ca3106db790c3960de41266aadc28acee42af0104a2bba9a122";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    filepath hinotify jack optparseApplicative transformers explicitException process
-  ];
-  meta = {
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/trivmix b/trivmix
new file mode 160000
index 00000000..41111d7e
--- /dev/null
+++ b/trivmix
@@ -0,0 +1 @@
+Subproject commit 41111d7e0b05f5bd6f17a25ac2abd604944440c1
-- 
cgit v1.2.3