From cc2aa6f3589ed6f1e9d134ba9b38622b71103c3f Mon Sep 17 00:00:00 2001
From: Andrey Golovizin <ag@sologoc.com>
Date: Fri, 2 Mar 2018 16:46:36 +0100
Subject: pythonPackages.pymetar: add myself as maintainer

---
 lib/maintainers.nix                | 1 +
 pkgs/top-level/python-packages.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 642ecf0b6080..c4f8d6dcae40 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -226,6 +226,7 @@
   erictapen = "Justin Humm <justin.humm@posteo.de>";
   erikryb = "Erik Rybakken <erik.rybakken@math.ntnu.no>";
   ertes = "Ertugrul Söylemez <esz@posteo.de>";
+  erosennin = "Andrey Golovizin <ag@sologoc.com>";
   ethercrow = "Dmitry Ivanov <ethercrow@gmail.com>";
   etu = "Elis Hirwing <elis@hirwing.se>";
   exfalso = "Andras Slemmer <0slemi0@gmail.com>";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3e6f4fcdafc8..04ac8cecc463 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12433,6 +12433,7 @@ in {
       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 ];
     };
   };
 
-- 
cgit 1.4.1


From a862a0e559593623b4f965bd9042490ec42dab22 Mon Sep 17 00:00:00 2001
From: Andrey Golovizin <ag@sologoc.com>
Date: Fri, 2 Mar 2018 16:47:28 +0100
Subject: pythonPackages.pymetar: 0.20 -> 0.21

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 04ac8cecc463..e8a9f7b24736 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12420,13 +12420,13 @@ in {
   pymetar = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "pymetar";
-    version = "0.20";
+    version = "0.21";
 
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/${pname}/${name}.tar.gz";
-      sha256 = "1rxyg9465cp6nc47pqxqf092wmbvv2zhffzvaf2w74laal43pgxw";
+      sha256 = "1sh3nm5ilnsgpnzbb2wv4xndnizjayw859qp72798jadqpcph69k";
     };
 
     meta = {
-- 
cgit 1.4.1


From e2f7ef7bf54661fc869603941cf372f1c81e254a Mon Sep 17 00:00:00 2001
From: Jörg Thalheim <joerg@thalheim.io>
Date: Fri, 2 Mar 2018 16:12:08 +0000
Subject: python.pkgs.pymetar: modernize

---
 pkgs/development/python-modules/pymetar/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/python-packages.nix                  | 20 +-------------------
 2 files changed, 21 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/pymetar/default.nix

diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix
new file mode 100644
index 000000000000..a918528bdf87
--- /dev/null
+++ b/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 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e8a9f7b24736..9c46ce73c0d0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12417,25 +12417,7 @@ in {
 
   pylibmc = callPackage ../development/python-modules/pylibmc {};
 
-  pymetar = buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "pymetar";
-    version = "0.21";
-
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/${pname}/${name}.tar.gz";
-      sha256 = "1sh3nm5ilnsgpnzbb2wv4xndnizjayw859qp72798jadqpcph69k";
-    };
-
-    meta = {
-      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 ];
-    };
-  };
+  pymetar = callPackage ../development/python-modules/pymetar { };
 
   pysftp = buildPythonPackage rec {
     name = "pysftp-${version}";
-- 
cgit 1.4.1