mv makefu/{slog,internetarchive} krebs/

3 files changed, 45 insertions, 33 deletions

diff --git a/krebs/5pkgs/simple/internetarchive/default.nix b/krebs/5pkgs/simple/internetarchive/default.nix
new file mode 100644
index 000000000..f5e1bbff3
--- /dev/null
+++ b/krebs/5pkgs/simple/internetarchive/default.nix
@@ -0,0 +1,38 @@
+{ pkgs, fetchFromGitHub, ... }:
+with pkgs.python3Packages;
+buildPythonPackage rec {
+  pname = "internetarchive";
+  version = "1.7.3";
+  name = "${pname}-${version}";
+  propagatedBuildInputs = [
+    requests
+      jsonpatch
+      docopt
+      clint
+      six
+      schema
+      backports_csv
+  ];
+
+# check only works when cloned from git repo
+  doCheck = false;
+  checkInputs = [
+    pytest
+      responses
+  ];
+
+  prePatch = ''
+    sed -i "s/'schema.*'/'schema>=0.4.0'/" setup.py
+    '';
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0x3saklabdx7qrr11h5bjfd75hfbih7pw5gvl2784zvvvrqrz45g";
+  };
+
+  meta = with stdenv.lib; {
+    description = "python library and cli for uploading files to internet archive";
+    license = licenses.agpl3;
+  };
+
+}
diff --git a/makefu/5pkgs/slog/default.nix b/krebs/5pkgs/simple/slog/default.nix
index a4dc33d28..c74a2ad80 100644
--- a/makefu/5pkgs/slog/default.nix
+++ b/krebs/5pkgs/simple/slog/default.nix
@@ -1,6 +1,6 @@
 { pkgs, stdenv, fetchFromGitHub }:
 
-## Posix shell logging, use with:
+## use with:
 # . $(command -v slog.sh)
 stdenv.mkDerivation rec {
   name = "slog-${version}";
@@ -17,4 +17,10 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     install -m755 slog.sh $out/bin
   '';
+
+  meta = with stdenv.lib; {
+    description = "POSIX shell logging";
+    license = licenses.mit;
+  };
+
 }
diff --git a/makefu/5pkgs/internetarchive/default.nix b/makefu/5pkgs/internetarchive/default.nix
deleted file mode 100644
index b661aeeed..000000000
--- a/makefu/5pkgs/internetarchive/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ pkgs, fetchFromGitHub, ... }:
-with pkgs.python3Packages;
-buildPythonPackage rec {
-    pname = "internetarchive";
-    version = "1.7.3";
-    name = "${pname}-${version}";
-    propagatedBuildInputs = [
-      requests
-      jsonpatch
-      docopt
-      clint
-      six
-      schema
-      backports_csv
-    ];
-
-    # check only works when cloned from git repo
-    doCheck = false;
-    checkInputs = [
-      pytest
-      responses
-    ];
-
-    prePatch = ''
-      sed -i "s/'schema.*'/'schema>=0.4.0'/" setup.py
-    '';
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "0x3saklabdx7qrr11h5bjfd75hfbih7pw5gvl2784zvvvrqrz45g";
-    };
-}