Merge branch 'ymir'

8 files changed, 0 insertions, 32 deletions

diff --git a/.gitmodules b/.gitmodules
index dec45e26..893c312d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,6 @@
 [submodule "trivmix"]
         path = custom/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
 [submodule "laeradhr"]
         path = laeradhr
         url = git://git.yggdrasil.li/laeradhr
diff --git a/beuteltier b/beuteltier
deleted file mode 160000
-Subproject 1a5d76465c0393d239266eec4aa9b6c1ada7d09
diff --git a/custom/thermoprint b/custom/thermoprint
-Subproject 196c14be08e5c17514c7d199085a44d094d8b0c
+Subproject 08eee2f0de77ffa631e84ccf734e8e95817b7c8
diff --git a/dotfiles b/dotfiles
-Subproject 289d0669d0528001c7f2ca6a28312f530d5ad13
+Subproject 36598e52f49b355a6fec739d82d5faea42790d6
diff --git a/opossum b/opossum
deleted file mode 160000
-Subproject 0f944da4ba804be7709c3a3cadb20aa59d3106a
diff --git a/users/gkleen@bragi.nix b/users/gkleen@bragi.nix
index e3c099f2..b67696a5 100644
--- a/users/gkleen@bragi.nix
+++ b/users/gkleen@bragi.nix
@@ -35,34 +35,11 @@
         in {
           attoparsecExpr = callPackage ../custom/attoparsec-expr.nix {};
           shellMonad = callPackage ../custom/shell-monad.nix {};
-          beuteltier = callPackage ../custom/beuteltier.nix {};
-          opossum = callPackage ../custom/opossum.nix {};
-          opossumWrapper = callPackage ../custom/opossum-wrapper.nix {};
-          wombat = callPackage ../custom/wombat.nix {};
-          wombatWrapper = pkgs.stdenv.mkDerivation {
-            name = "wombat-wrapper";
-            src = self.wombat;
-            unpackPhase = "true";
-            buildInputs = [ pkgs.makeWrapper pkgs.rsync ];
-            installPhase = ''
-              mkdir -p $out
-              rsync -a $src/ $out/
-              chmod u+w $out/bin
-              wrapProgram $out/bin/wombat \
-                --prefix PATH : ${pkgs.ffmpeg}/bin \
-                --prefix PATH : ${pkgs.wget}/bin \
-                --prefix PATH : ${pkgs.youtube-dl}/bin
-            '';
-          };
           filelock = callPackage ../custom/filelock.nix {};
           trivmix = callPackage ../custom/trivmix.nix {};
         };
       }
     );
-    runOpossum = pkgs.callPackage ../custom/run-opossum_bragi.nix {
-      wombat = myHaskellPackages.wombatWrapper;
-      opossum = myHaskellPackages.opossumWrapper;
-    };
     adjmix = let trivmix = myHaskellPackages.trivmix; in
       pkgs.stdenv.mkDerivation {
         name = "adjmix";
diff --git a/utils b/utils
-Subproject c779f0540d8db359e09df975206046bb5b971fd
+Subproject dd28d96d3469a46888ac4e1103818978aa4fc51
diff --git a/wombat b/wombat
deleted file mode 160000
-Subproject b09c8c567fed4154b1ea9d7d5a492a628ea6b67