summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-11-09 00:18:45 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2015-11-09 00:18:45 +0100
commit6348c2ab97d1b20d53de9d190ed637a2d14ca57b (patch)
treec5887b1688b476bb6593c1bd3575e65dd7c41562
parent0005cb1e550a8538cd03a04ae05fa0ee71353b4c (diff)
downloadnixos-6348c2ab97d1b20d53de9d190ed637a2d14ca57b.tar
nixos-6348c2ab97d1b20d53de9d190ed637a2d14ca57b.tar.gz
nixos-6348c2ab97d1b20d53de9d190ed637a2d14ca57b.tar.bz2
nixos-6348c2ab97d1b20d53de9d190ed637a2d14ca57b.tar.xz
nixos-6348c2ab97d1b20d53de9d190ed637a2d14ca57b.zip
stripped beuteltier
-rw-r--r--.gitmodules9
m---------beuteltier0
m---------opossum0
-rw-r--r--users/gkleen@bragi.nix23
m---------wombat0
5 files changed, 0 insertions, 32 deletions
diff --git a/.gitmodules b/.gitmodules
index 51c669ec..4b1692e0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,6 @@
1[submodule "trivmix"] 1[submodule "trivmix"]
2 path = trivmix 2 path = trivmix
3 url = git://git.yggdrasil.li/trivmix 3 url = git://git.yggdrasil.li/trivmix
4[submodule "beuteltier"]
5 path = beuteltier
6 url = git://git.yggdrasil.li/beuteltier
7[submodule "opossum"]
8 path = opossum
9 url = git://git.yggdrasil.li/opossum
10[submodule "wombat"]
11 path = wombat
12 url = git://git.yggdrasil.li/wombat
13[submodule "laeradhr"] 4[submodule "laeradhr"]
14 path = laeradhr 5 path = laeradhr
15 url = git://git.yggdrasil.li/laeradhr 6 url = git://git.yggdrasil.li/laeradhr
diff --git a/beuteltier b/beuteltier
deleted file mode 160000
Subproject 1a5d76465c0393d239266eec4aa9b6c1ada7d09
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 @@
35 in { 35 in {
36 attoparsecExpr = callPackage ../custom/attoparsec-expr.nix {}; 36 attoparsecExpr = callPackage ../custom/attoparsec-expr.nix {};
37 shellMonad = callPackage ../custom/shell-monad.nix {}; 37 shellMonad = callPackage ../custom/shell-monad.nix {};
38 beuteltier = callPackage ../custom/beuteltier.nix {};
39 opossum = callPackage ../custom/opossum.nix {};
40 opossumWrapper = callPackage ../custom/opossum-wrapper.nix {};
41 wombat = callPackage ../custom/wombat.nix {};
42 wombatWrapper = pkgs.stdenv.mkDerivation {
43 name = "wombat-wrapper";
44 src = self.wombat;
45 unpackPhase = "true";
46 buildInputs = [ pkgs.makeWrapper pkgs.rsync ];
47 installPhase = ''
48 mkdir -p $out
49 rsync -a $src/ $out/
50 chmod u+w $out/bin
51 wrapProgram $out/bin/wombat \
52 --prefix PATH : ${pkgs.ffmpeg}/bin \
53 --prefix PATH : ${pkgs.wget}/bin \
54 --prefix PATH : ${pkgs.youtube-dl}/bin
55 '';
56 };
57 filelock = callPackage ../custom/filelock.nix {}; 38 filelock = callPackage ../custom/filelock.nix {};
58 trivmix = callPackage ../custom/trivmix.nix {}; 39 trivmix = callPackage ../custom/trivmix.nix {};
59 }; 40 };
60 } 41 }
61 ); 42 );
62 runOpossum = pkgs.callPackage ../custom/run-opossum_bragi.nix {
63 wombat = myHaskellPackages.wombatWrapper;
64 opossum = myHaskellPackages.opossumWrapper;
65 };
66 adjmix = let trivmix = myHaskellPackages.trivmix; in 43 adjmix = let trivmix = myHaskellPackages.trivmix; in
67 pkgs.stdenv.mkDerivation { 44 pkgs.stdenv.mkDerivation {
68 name = "adjmix"; 45 name = "adjmix";
diff --git a/wombat b/wombat
deleted file mode 160000
Subproject b09c8c567fed4154b1ea9d7d5a492a628ea6b67