Switched custom derivitions to submodules

5 files changed, 5 insertions, 26 deletions

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
+Subproject 41111d7e0b05f5bd6f17a25ac2abd604944440c