From 6348c2ab97d1b20d53de9d190ed637a2d14ca57b Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 9 Nov 2015 00:18:45 +0100 Subject: stripped beuteltier --- .gitmodules | 9 --------- beuteltier | 1 - opossum | 1 - users/gkleen@bragi.nix | 23 ----------------------- wombat | 1 - 5 files changed, 35 deletions(-) delete mode 160000 beuteltier delete mode 160000 opossum delete mode 160000 wombat diff --git a/.gitmodules b/.gitmodules index 51c669ec..4b1692e0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,6 @@ [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 [submodule "laeradhr"] path = laeradhr url = git://git.yggdrasil.li/laeradhr diff --git a/beuteltier b/beuteltier deleted file mode 160000 index 1a5d7646..00000000 --- a/beuteltier +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1a5d76465c0393d239266eec4aa9b6c1ada7d094 diff --git a/opossum b/opossum deleted file mode 160000 index 0f944da4..00000000 --- a/opossum +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0f944da4ba804be7709c3a3cadb20aa59d3106a0 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/wombat b/wombat deleted file mode 160000 index b09c8c56..00000000 --- a/wombat +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b09c8c567fed4154b1ea9d7d5a492a628ea6b678 -- cgit v1.2.3 From e45e6176a0adbf5bc165b3413cc1cdc6912cfca8 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 9 Nov 2015 01:21:17 +0100 Subject: Set all submodules to follow remote --- custom/thermoprint | 2 +- dotfiles | 2 +- trivmix | 2 +- utils | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/custom/thermoprint b/custom/thermoprint index 196c14be..08eee2f0 160000 --- a/custom/thermoprint +++ b/custom/thermoprint @@ -1 +1 @@ -Subproject commit 196c14be08e5c17514c7d199085a44d094d8b0c3 +Subproject commit 08eee2f0de77ffa631e84ccf734e8e95817b7c81 diff --git a/dotfiles b/dotfiles index 289d0669..36598e52 160000 --- a/dotfiles +++ b/dotfiles @@ -1 +1 @@ -Subproject commit 289d0669d0528001c7f2ca6a28312f530d5ad13a +Subproject commit 36598e52f49b355a6fec739d82d5faea42790d65 diff --git a/trivmix b/trivmix index 34405c67..d4091751 160000 --- a/trivmix +++ b/trivmix @@ -1 +1 @@ -Subproject commit 34405c67012884b9ffad6c013444b2beb8ec64f1 +Subproject commit d40917517feeaffc3d8e90cf8e06004623b0c5ff diff --git a/utils b/utils index c779f054..dd28d96d 160000 --- a/utils +++ b/utils @@ -1 +1 @@ -Subproject commit c779f0540d8db359e09df975206046bb5b971fd3 +Subproject commit dd28d96d3469a46888ac4e1103818978aa4fc51b -- cgit v1.2.3