Commit 33465c23 authored by Fabian Affolter's avatar Fabian Affolter
Browse files
parent d5d16930
Loading
Loading
Loading
Loading
+4 −14
Original line number Diff line number Diff line
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, nose
, numpy
, pythonOlder
@@ -10,7 +9,7 @@

buildPythonPackage rec {
  pname = "ecos";
  version = "2.0.10";
  version = "2.0.11";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@@ -18,20 +17,11 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "embotech";
    repo = "ecos-python";
    rev = "v${version}";
    hash = "sha256-TPxrTyVZ1KXgPoDbZZqXT5+NEIEndg9qepujqFQwK+Q=";
    rev = "refs/tags/v${version}";
    hash = "sha256-jflmXR7fuGRSyI6NoQrHFvkKqF/D4iq47StNSCdLbqQ=";
    fetchSubmodules = true;
  };

  patches = [
    # Fix for test_interface_bb.py tests
    (fetchpatch {
      name = "test_interface_bb_use_nparray.patch";
      url = "https://github.com/embotech/ecos-python/commit/4440dcb7ddbd92217bc83d8916b72b61537dffbf.patch";
      hash = "sha256-pcTPviK916jzCLllRhopbC9wDHv+aS6GmV/92sUwzHc=";
    })
  ];

  propagatedBuildInputs = [
    numpy
    scipy
@@ -51,7 +41,7 @@ buildPythonPackage rec {
  ];

  meta = with lib; {
    description = "Python package for ECOS: Embedded Cone Solver";
    description = "Python interface for ECOS";
    homepage = "https://github.com/embotech/ecos-python";
    license = licenses.gpl3Only;
    maintainers = with maintainers; [ drewrisinger ];