summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-03-02 16:13:51 +0000
committerGitHub <noreply@github.com>2018-03-02 16:13:51 +0000
commit22b4349b3a0c2634db923238f4e560abad7a737c (patch)
treee3719094a07d49669bf9ab9ad43eb18a4e990eb9
parent609f0e05b0a43b016902d9f263c701a3ac312b45 (diff)
parente2f7ef7bf54661fc869603941cf372f1c81e254a (diff)
downloadnixlib-22b4349b3a0c2634db923238f4e560abad7a737c.tar
nixlib-22b4349b3a0c2634db923238f4e560abad7a737c.tar.gz
nixlib-22b4349b3a0c2634db923238f4e560abad7a737c.tar.bz2
nixlib-22b4349b3a0c2634db923238f4e560abad7a737c.tar.lz
nixlib-22b4349b3a0c2634db923238f4e560abad7a737c.tar.xz
nixlib-22b4349b3a0c2634db923238f4e560abad7a737c.tar.zst
nixlib-22b4349b3a0c2634db923238f4e560abad7a737c.zip
Merge pull request #36224 from erosennin/pymetar-0.21
pythonPackages.pymetar: 0.20 -> 0.21
-rw-r--r--lib/maintainers.nix1
-rw-r--r--pkgs/development/python-modules/pymetar/default.nix20
-rw-r--r--pkgs/top-level/python-packages.nix19
3 files changed, 22 insertions, 18 deletions
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/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 82d26e92f2b4..c17112e623c0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12417,24 +12417,7 @@ in {
 
   pylibmc = callPackage ../development/python-modules/pylibmc {};
 
-  pymetar = buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "pymetar";
-    version = "0.20";
-
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/${pname}/${name}.tar.gz";
-      sha256 = "1rxyg9465cp6nc47pqxqf092wmbvv2zhffzvaf2w74laal43pgxw";
-    };
-
-    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;
-    };
-  };
+  pymetar = callPackage ../development/python-modules/pymetar { };
 
   pysftp = buildPythonPackage rec {
     name = "pysftp-${version}";