6 files changed, 43 insertions, 141 deletions
diff --git a/makefu/5pkgs/bento4/default.nix b/makefu/5pkgs/bento4/default.nix
deleted file mode 100644
index 6f5f1deb..00000000
--- a/makefu/5pkgs/bento4/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchFromGitHub
-, cmake
-}:
-stdenv.mkDerivation rec {
-  name = "bento4-${version}";
-  version = "1.5.1-624";
-
-  src = fetchFromGitHub {
-    owner = "axiomatic-systems";
-    repo = "Bento4";
-    rev = "v${version}";
-    sha256 = "1cq6vhrq3n3lc1n454slbc66qdyqam2srxgdhfpyfxbq5c4y06nf";
-  };
-
-  nativeBuildInputs = [ cmake ];
-  installPhase = ''
-    mkdir -p $out/{lib,bin}
-    find -iname '*.so' -exec mv --target-directory="$out/lib" {} \;
-    find -maxdepth 1 -executable -type f -exec mv --target-directory="$out/bin" {} \;
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Full-featured MP4 format and MPEG DASH library and tools";
-    homepage = http://bento4.com;
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ makefu ];
-    platforms = with platforms; linux;
-  };
-}
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 8ae41427..1ae10459 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -1,4 +1,4 @@
-self: super: 
+self: super:
 with super.lib; with builtins; let
   # This callPackage will try to detect obsolete overrides.
   callPackage = path: args: let
diff --git a/makefu/5pkgs/init-host/default.nix b/makefu/5pkgs/init-host/default.nix
deleted file mode 100644
index d1d3f719..00000000
--- a/makefu/5pkgs/init-host/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ pkgs }:
-pkgs.writeDashBin "generate-secrets" ''
-  set -euf
-  HOSTNAME="''${1?must provide hostname}"
-  TMPDIR=$(${pkgs.coreutils}/bin/mktemp -d)
-  PASSWORD=$(${pkgs.pwgen}/bin/pwgen 25 1)
-  HASHED_PASSWORD=$(echo $PASSWORD | ${pkgs.hashPassword}/bin/hashPassword -s) > /dev/null
-
-  ${pkgs.openssh}/bin/ssh-keygen -t ed25519 -f $TMPDIR/ssh.id_ed25519 -P "" -C "" >/dev/null
-  ${pkgs.openssl}/bin/openssl genrsa -out $TMPDIR/retiolum.rsa_key.priv 4096 2>/dev/null > /dev/null
-  ${pkgs.openssl}/bin/openssl rsa -in $TMPDIR/retiolum.rsa_key.priv -pubout -out $TMPDIR/retiolum.rsa_key.pub 2>/dev/null > /dev/null
-  cat <<EOF > $TMPDIR/hashedPasswords.nix
-  {
-    root = "$HASHED_PASSWORD";
-  }
-  EOF
-
-  cd $TMPDIR
-  for x in *; do
-    ${pkgs.coreutils}/bin/cat $x | secrets insert -m $HOSTNAME/$x > /dev/null
-  done
-  echo $PASSWORD | secrets insert -m $HOSTNAME/root > /dev/null
-
-  cat <<EOF
-    $HOSTNAME = {
-      cores = 1;
-      owner = config.krebs.users.makefu;
-      nets = {
-        retiolum = {
-          ip4.addr = "10.243.0.changeme";
-          ip6.addr = "42:0:0:0:0:0:0:changeme";
-          aliases = [
-            "$HOSTNAME.r"
-          ];
-          tinc.pubkey = ${"''"}
-  $(cat $TMPDIR/retiolum.rsa_key.pub)
-          ${"''"};
-        };
-      };
-      ssh.privkey.path = <secrets/ssh.id_ed25519>;
-      ssh.pubkey = "$(cat $TMPDIR/ssh.id_ed25519.pub)";
-    };
-  EOF
-
-  rm -rf $TMPDIR
-''
-
diff --git a/makefu/5pkgs/prison-break/default.nix b/makefu/5pkgs/prison-break/default.nix
new file mode 100644
index 00000000..f86ac376
--- /dev/null
+++ b/makefu/5pkgs/prison-break/default.nix
@@ -0,0 +1,20 @@
+{pkgs, fetchFromGitHub}:
+with pkgs.python3.pkgs;
+
+buildPythonPackage rec {
+  pname = "prison-break";
+  version = "0.1.0";
+  src = fetchFromGitHub {
+    owner = "makefu";
+    repo = pname;
+    rev = "5eed6371e151e716faafa054e005bd98d77b4b5d";
+    sha256 = "170zs9grbgkx83ghg6pm13v7vhi604y44j550ypp2x26nidaw63j";
+  };
+  propagatedBuildInputs = [
+    docopt
+    requests
+    beautifulsoup4
+    (callPackage ./straight-plugin.nix {})
+  ];
+  checkInputs = [ black ];
+}
diff --git a/makefu/5pkgs/prison-break/straight-plugin.nix b/makefu/5pkgs/prison-break/straight-plugin.nix
new file mode 100644
index 00000000..606c60b5
--- /dev/null
+++ b/makefu/5pkgs/prison-break/straight-plugin.nix
@@ -0,0 +1,22 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "straight-plugin";
+  version = "1.5.0";
+
+  src = fetchPypi {
+    pname = "straight.plugin";
+    inherit version;
+    sha256 = "818a7641068932ed6436d0af0a3bb77bbbde29df0a7142c8bd1a249e7c2f0d38";
+  };
+
+  meta = with lib; {
+    description = "A simple namespaced plugin facility";
+    homepage = https://github.com/ironfroggy/straight.plugin;
+    license = licenses.mit;
+    maintainers = [ maintainers.makefu ];
+  };
+}
diff --git a/makefu/5pkgs/targetcli/default.nix b/makefu/5pkgs/targetcli/default.nix
deleted file mode 100644
index 927c34c5..00000000
--- a/makefu/5pkgs/targetcli/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ pkgs, fetchFromGitHub, ... }:
-with pkgs.python2Packages;
-let
-  version = "2.1";
-  rtslib = buildPythonPackage rec {
-    pname = "rtslib";
-    inherit version;
-    src = fetchFromGitHub {
-      owner = "datera";
-      repo = "rtslib";
-      rev = version;
-      sha256 = "1d58k9i4xigfqgycyismsqzkz65ssjdri2v9fg0wpica1klyyv22";
-    };
-    propagatedBuildInputs = [ ipaddr netifaces configobj ];
-  };
-  configshell = buildPythonPackage rec {
-    pname = "configshell";
-    version = "1.6";
-    src = fetchFromGitHub {
-      owner = "datera";
-      repo = "configshell";
-      rev = version;
-      sha256 = "14n7xbcaicsvwajv1aihz727dlkn6zfaqjbnn7mcpns83c2hms7y";
-    };
-    propagatedBuildInputs = [ pyparsing ];
-  };
-
-  tcm-py  = buildPythonPackage rec {
-    pname = "tcm-py";
-    version = "0ac9091c1ff7a52d5435a4f4449e82637142e06e";
-    src = fetchFromGitHub {
-      owner = "datera";
-      repo = "lio-utils";
-      rev = "0ac9091c1ff7a52d5435a4f4449e82637142e06e";
-      sha256 = "0fc922kxvgr7rwg1y875vqvkipcrixmlafsp5g8mipmq90i8zcq0";
-    } + "/tcm-py";
-    propagatedBuildInputs = [ ];
-  };
-
-  lio-py = buildPythonPackage rec {
-    pname = "lio-py";
-    version = "0ac9091c1ff7a52d5435a4f4449e82637142e06e";
-    src = fetchFromGitHub {
-      owner = "datera";
-      repo = "lio-utils";
-      rev = "0ac9091c1ff7a52d5435a4f4449e82637142e06e";
-      sha256 = "0fc922kxvgr7rwg1y875vqvkipcrixmlafsp5g8mipmq90i8zcq0";
-    } + "/lio-py";
-    propagatedBuildInputs = [ ];
-  };
-
-in buildPythonApplication rec {
-  pname = "targetcli";
-  inherit version;
-
-  propagatedBuildInputs = [ rtslib configshell lio-py tcm-py ];
-
-  src = fetchFromGitHub {
-    owner = "datera";
-    repo = "targetcli";
-    rev = version;
-    sha256 = "10nax7761g93qzky01y3hra8i4s11cgyy9w5w6l8781lj21lgi3d";
-  };
-}