Merge branch 'ymir'

1 files changed, 0 insertions, 23 deletions

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";