From 085cc293237629b7c2ac8d2275cdca312d682046 Mon Sep 17 00:00:00 2001 From: Andrey Golovizin Date: Wed, 5 Sep 2018 22:26:25 +0200 Subject: [PATCH 1/3] pythonPackages.pymetar: fix license --- pkgs/development/python-modules/pymetar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix index a918528bdf8..4b7388d49db 100644 --- a/pkgs/development/python-modules/pymetar/default.nix +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { 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; + license = licenses.gpl2Plus; maintainers = with maintainers; [ erosennin ]; }; } From ee841c57bf29959bd604c0668c30f3ce526aa6bd Mon Sep 17 00:00:00 2001 From: Andrey Golovizin Date: Wed, 5 Sep 2018 22:32:08 +0200 Subject: [PATCH 2/3] pythonPackages.pymetar: 0.21 -> 1.0 --- pkgs/development/python-modules/pymetar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix index 4b7388d49db..d41eec81818 100644 --- a/pkgs/development/python-modules/pymetar/default.nix +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pymetar"; - version = "0.21"; + version = "1.0"; - disabled = isPy3k; + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1sh3nm5ilnsgpnzbb2wv4xndnizjayw859qp72798jadqpcph69k"; + sha256 = "1n4k5aic4sgp43ki6j3zdw9b21r3biqqws8ah57b77n44b8wzrap"; }; meta = with stdenv.lib; { From 7de5708e9ed312b331bbf0953f4fd30ea8a94e22 Mon Sep 17 00:00:00 2001 From: Andrey Golovizin Date: Wed, 5 Sep 2018 22:56:18 +0200 Subject: [PATCH 3/3] pythonPackages.pymetar: enable tests --- pkgs/development/python-modules/pymetar/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix index d41eec81818..339ddcbc791 100644 --- a/pkgs/development/python-modules/pymetar/default.nix +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchPypi }: +{ stdenv, python, buildPythonPackage, isPy3k, fetchPypi }: buildPythonPackage rec { pname = "pymetar"; @@ -11,6 +11,16 @@ buildPythonPackage rec { sha256 = "1n4k5aic4sgp43ki6j3zdw9b21r3biqqws8ah57b77n44b8wzrap"; }; + checkPhase = '' + cd testing/smoketest + tar xzf reports.tgz + mkdir logs + patchShebangs runtests.sh + substituteInPlace runtests.sh --replace "break" "exit 1" # fail properly + export PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}" + ./runtests.sh + ''; + 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;