summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-06-23 23:17:56 +0200
committerlassulus <lass@aidsballs.de>2016-06-23 23:17:56 +0200
commit3e8a1cdebe200dd6de07f426403cc4716b838cbf (patch)
tree4250325821f9f957fa6d07515f3078eac16aefc7
parentf22111ea950481a508f03f2de7a01962fd0d56e2 (diff)
parent3716ece83b97500e39d08b45acf34dbb78af4b29 (diff)
Merge remote-tracking branch 'gum/master'
-rw-r--r--makefu/5pkgs/bintray-upload/default.nix19
-rw-r--r--makefu/5pkgs/default.nix3
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 {};
};
}