From 2e39f7b3d1805346e067bdc7236bd7dfe87381a2 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 27 Oct 2017 11:07:19 +0200
Subject: mv makefu/{slog,internetarchive} krebs/

---
 krebs/5pkgs/simple/internetarchive/default.nix | 38 ++++++++++++++++++++++++++
 krebs/5pkgs/simple/slog/default.nix            | 26 ++++++++++++++++++
 makefu/5pkgs/internetarchive/default.nix       | 32 ----------------------
 makefu/5pkgs/slog/default.nix                  | 20 --------------
 4 files changed, 64 insertions(+), 52 deletions(-)
 create mode 100644 krebs/5pkgs/simple/internetarchive/default.nix
 create mode 100644 krebs/5pkgs/simple/slog/default.nix
 delete mode 100644 makefu/5pkgs/internetarchive/default.nix
 delete mode 100644 makefu/5pkgs/slog/default.nix

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/krebs/5pkgs/simple/slog/default.nix b/krebs/5pkgs/simple/slog/default.nix
new file mode 100644
index 000000000..c74a2ad80
--- /dev/null
+++ b/krebs/5pkgs/simple/slog/default.nix
@@ -0,0 +1,26 @@
+{ pkgs, stdenv, fetchFromGitHub }:
+
+## use with:
+# . $(command -v slog.sh)
+stdenv.mkDerivation rec {
+  name = "slog-${version}";
+  version = "2017-10-27";
+
+  src = fetchFromGitHub {
+    owner = "makefu";
+    repo = "slog";
+    rev = "50367c3";
+    sha256 = "16wlh8xz430101lrxmgl2wangbbhvyj4pg8k5aibnh76sgj6x77r";
+  };
+
+  installPhase = ''
+    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";
-    };
-}
diff --git a/makefu/5pkgs/slog/default.nix b/makefu/5pkgs/slog/default.nix
deleted file mode 100644
index a4dc33d28..000000000
--- a/makefu/5pkgs/slog/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ pkgs, stdenv, fetchFromGitHub }:
-
-## Posix shell logging, use with:
-# . $(command -v slog.sh)
-stdenv.mkDerivation rec {
-  name = "slog-${version}";
-  version = "2017-10-27";
-
-  src = fetchFromGitHub {
-    owner = "makefu";
-    repo = "slog";
-    rev = "50367c3";
-    sha256 = "16wlh8xz430101lrxmgl2wangbbhvyj4pg8k5aibnh76sgj6x77r";
-  };
-
-  installPhase = ''
-    mkdir -p $out/bin
-    install -m755 slog.sh $out/bin
-  '';
-}
-- 
cgit v1.2.3