Merge remote-tracking branch 'prism/master'

2 files changed, 21 insertions, 1 deletions

diff --git a/makefu/5pkgs/bintray-upload/default.nix b/makefu/5pkgs/bintray-upload/default.nix
new file mode 100644
index 000000000..1e9582cca
--- /dev/null
+++ b/makefu/5pkgs/bintray-upload/default.nix
@@ -0,0 +1,19 @@
+{ pkgs, ... }:
+
+pkgs.python3Packages.buildPythonPackage rec {
+  name = "bintray-upload-${version}";
+  version = "0.1.2";
+  src = pkgs.fetchFromGitHub {
+    owner = "makefu";
+    repo = "bintray-upload";
+    rev = "4e76724";
+    sha256 = "1401saisk98n5wgw73nwh8hb484vayw5c6dlypxc1fp4ybym4zi9";
+  };
+
+  propagatedBuildInputs = with pkgs.python3Packages; [ requests2 ];
+
+  meta = {
+    description = "Simple BinTray utility for uploading packages";
+    license = pkgs.stdenv.lib.licenses.asl20;
+  };
+}
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 6d227fa6d..bb6290af2 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -13,7 +13,8 @@ in
     nodemcu-uploader = callPackage ./nodemcu-uploader {};
     tw-upload-plugin = callPackage ./tw-upload-plugin {};
     inherit (callPackage ./devpi {}) devpi-web devpi-server;
-    skytraq-logger = callPackage ./skytraq-logger/ {};
+    skytraq-logger = callPackage ./skytraq-logger {};
     taskserver = callPackage ./taskserver {};
+    bintray-upload = callPackage ./bintray-upload {};
   };
 }