From de1480e079974b06d41a5a8c2c3de01320833d16 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 22 Sep 2017 22:19:20 -0400 Subject: [PATCH 1/2] pythonPackages.simanneal: init at 0.4.1 --- .../python-modules/simanneal/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/python-modules/simanneal/default.nix diff --git a/pkgs/development/python-modules/simanneal/default.nix b/pkgs/development/python-modules/simanneal/default.nix new file mode 100644 index 00000000000..66a9628673b --- /dev/null +++ b/pkgs/development/python-modules/simanneal/default.nix @@ -0,0 +1,19 @@ +{ lib, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "simanneal"; + version = "0.4.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ib1hv2adq6x25z13nb4s1asci6dqarpyhpdq144y2rqqff2m01x"; + }; + + meta = { + description = "A python implementation of the simulated annealing optimization technique"; + homepage = https://github.com/perrygeo/simanneal; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fdb65032e7b..69508d1f543 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19512,6 +19512,8 @@ in { }; }; + simanneal = callPackage ../development/python-modules/simanneal { }; + simplebayes = buildPythonPackage rec { name = "simplebayes-${version}"; version = "1.5.8"; From dd9959295205489016e1877f96a0f0c83eef5743 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Sun, 24 Sep 2017 15:57:49 +0100 Subject: [PATCH 2/2] python.pkgs.simanneal: enable tests --- .../python-modules/simanneal/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/simanneal/default.nix b/pkgs/development/python-modules/simanneal/default.nix index 66a9628673b..e3f65b6660c 100644 --- a/pkgs/development/python-modules/simanneal/default.nix +++ b/pkgs/development/python-modules/simanneal/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }: buildPythonPackage rec { pname = "simanneal"; version = "0.4.1"; name = "${pname}-${version}"; - src = fetchPypi { - inherit pname version; - sha256 = "1ib1hv2adq6x25z13nb4s1asci6dqarpyhpdq144y2rqqff2m01x"; + src = fetchFromGitHub { + owner = "perrygeo"; + repo = "simanneal"; + rev = version; + sha256 = "12499wvf7ii7cy8z2f1d472p7q9napg1lj0h9xx8l1mbr1hjlp3q"; }; - meta = { + checkInputs = [ pytest ]; + checkPhase = "pytest tests"; + + meta = with stdenv.lib; { description = "A python implementation of the simulated annealing optimization technique"; homepage = https://github.com/perrygeo/simanneal; - license = lib.licenses.isc; - maintainers = with lib.maintainers; [ veprbl ]; + license = licenses.isc; + maintainers = with maintainers; [ veprbl ]; }; }