Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-02-17 15:12:28 +01:00
112 changed files with 1748 additions and 1807 deletions
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "ecos";
version = "2.0.6";
version = "2.0.7";
src = fetchFromGitHub {
owner = "embotech";
repo = "ecos";
rev = "v${version}";
sha256 = "11v958j66wq30gxpjpkgl7n3rvla845lygz8fl39pgf1vk9sdyc7";
rev = version;
sha256 = "1hsndim5kjvcwk5svqa4igawzahj982180xj1d7yd0dbjlgxc7w7";
};
buildPhase = ''
@@ -29,9 +29,10 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A lightweight conic solver for second-order cone programming";
homepage = https://www.embotech.com/ECOS;
homepage = "https://www.embotech.com/ECOS";
downloadPage = "https://github.com/embotech/ecos/releases";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = [ maintainers.bhipple ];
maintainers = with maintainers; [ bhipple ];
};
}