Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging

pkgs/development/python-modules/bap/default.nix

@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "bap";
-  version = "1.1.0";
+  version = "1.3.1";
   name = "${pname}-${version}";
   src = fetchFromGitHub {
     owner = "BinaryAnalysisPlatform";
     repo = "bap-python";
-    rev = "v${version}";
-    sha256 = "0wd46ksxscgb2dci69sbndzxs6drq5cahraqq42cdk114hkrsxs3";
+    rev = "${version}";
+    sha256 = "1ahkrmcn7qaivps1gar8wd9mq2qqyx6zzvznf5r9rr05h17x5lbp";
   };
 
   propagatedBuildInputs = [bap requests];

pkgs/development/python-modules/pymetar/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, isPy3k, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "pymetar";
+  version = "0.21";
+
+  disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1sh3nm5ilnsgpnzbb2wv4xndnizjayw859qp72798jadqpcph69k";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A command-line tool to show the weather report by a given station ID";
+    homepage = http://www.schwarzvogel.de/software/pymetar.html;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ erosennin ];
+  };
+}