From 4431542b8267143a5876f687ed429f5589cba5e5 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Mon, 27 Jan 2020 15:14:46 -0500 Subject: pythonPackages.scs: init at 2.1.1 Depends on libraries.science.math.scs. Required by cvxpy -> qiskit-aer. Co-authored-by: bhipple --- pkgs/development/python-modules/scs/default.nix | 56 +++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/scs/default.nix (limited to 'pkgs/development/python-modules') diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix new file mode 100644 index 00000000000..4e500d68535 --- /dev/null +++ b/pkgs/development/python-modules/scs/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, blas +, liblapack +, numpy +, scipy +, scs + # check inputs +, nose +}: + +buildPythonPackage rec { + inherit (scs) pname version; + + src = fetchFromGitHub { + owner = "bodono"; + repo = "scs-python"; + rev = "f02abdc0e2e0a5851464e30f6766ccdbb19d73f0"; # need to choose commit manually, untagged + sha256 = "174b5s7cwgrn1m55jlrszdl403zhpzc4yl9acs6kjv9slmg1mmjr"; + }; + + preConfigure = '' + rm -r scs + ln -s ${scs.src} scs + ''; + + buildInputs = [ + liblapack + blas + ]; + + propagatedBuildInputs = [ + numpy + scipy + ]; + + checkInputs = [ nose ]; + checkPhase = '' + nosetests + ''; + pythonImportsCheck = [ "scs" ]; + + meta = with lib; { + description = "Python interface for SCS: Splitting Conic Solver"; + longDescription = '' + Solves convex cone programs via operator splitting. + Can solve: linear programs (LPs), second-order cone programs (SOCPs), semidefinite programs (SDPs), + exponential cone programs (ECPs), and power cone programs (PCPs), or problems with any combination of those cones. + ''; + homepage = "https://github.com/cvxgrp/scs"; # upstream C package + downloadPage = "https://github.com/bodono/scs-python"; + license = licenses.gpl3; + maintainers = with maintainers; [ drewrisinger ]; + }; +} -- cgit 1.4.1 From 8dd592e3b2cdcf232a8d905ba4fc6d499491e10e Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Thu, 20 Feb 2020 15:00:08 +0100 Subject: pythonPackages.can: remove pytest-timeout check input pytest-timeout can cause tests to be flaky. It's not necessary to patch the code, as pytest ignores unrecognized marks with an ignorable warning. --- pkgs/development/python-modules/can/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'pkgs/development/python-modules') diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index b9d2b4b7751..8aa80a75067 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -24,12 +24,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing; - checkInputs = [ nose mock pytest pytest-timeout hypothesis future ]; - - # Tests won't work with hypothesis 4.7.3 under Python 2. So skip the tests in - # that case. This clause can be removed once hypothesis has been upgraded in - # nixpkgs. - doCheck = !(isPy27 && (hypothesis.version == "4.7.3")); + checkInputs = [ nose mock pytest hypothesis future ]; # Add the scripts to PATH checkPhase = '' -- cgit 1.4.1 From d57c05acd165ba8a428b13457c87d24175f58136 Mon Sep 17 00:00:00 2001 From: koral Date: Sun, 16 Feb 2020 14:40:48 +0100 Subject: mps-youtube: 0.2.8 -> unstable-2020-01-28 Also move derivation from python-packages to all-packages, as this is a standalone application. --- pkgs/applications/misc/mps-youtube/default.nix | 34 +++++++++++++++++++++ .../python-modules/mps-youtube/default.nix | 35 ---------------------- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 -- 4 files changed, 36 insertions(+), 37 deletions(-) create mode 100644 pkgs/applications/misc/mps-youtube/default.nix delete mode 100644 pkgs/development/python-modules/mps-youtube/default.nix (limited to 'pkgs/development/python-modules') diff --git a/pkgs/applications/misc/mps-youtube/default.nix b/pkgs/applications/misc/mps-youtube/default.nix new file mode 100644 index 00000000000..b1118cfc597 --- /dev/null +++ b/pkgs/applications/misc/mps-youtube/default.nix @@ -0,0 +1,34 @@ +{ lib, python3Packages, fetchFromGitHub }: + +with python3Packages; + +buildPythonApplication rec { + pname = "mps-youtube"; + version = "unstable-2020-01-28"; + + src = fetchFromGitHub { + owner = "mps-youtube"; + repo = "mps-youtube"; + rev = "b808697133ec2ad7654953232d1e841b20aa7cc3"; + sha256 = "0lqprlpc0v092xqkjc0cc395ag45lijwgd34dpg2jy6i0f2szywv"; + }; + + propagatedBuildInputs = [ pafy ]; + + # disabled due to error in loading unittest + # don't know how to make test from: + doCheck = false; + + # before check create a directory and redirect XDG_CONFIG_HOME to it + preCheck = '' + mkdir -p check-phase + export XDG_CONFIG_HOME=$(pwd)/check-phase + ''; + + meta = with lib; { + description = "Terminal based YouTube player and downloader"; + homepage = "https://github.com/mps-youtube/mps-youtube"; + license = licenses.gpl3; + maintainers = with maintainers; [ koral odi ]; + }; +} diff --git a/pkgs/development/python-modules/mps-youtube/default.nix b/pkgs/development/python-modules/mps-youtube/default.nix deleted file mode 100644 index 753a0d24d0a..00000000000 --- a/pkgs/development/python-modules/mps-youtube/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k -, pafy -}: - -buildPythonPackage rec { - pname = "mps-youtube"; - version = "0.2.8"; - disabled = (!isPy3k); - - src = fetchFromGitHub { - owner = "mps-youtube"; - repo = "mps-youtube"; - rev = "v${version}"; - sha256 = "1w1jhw9rg3dx7vp97cwrk5fymipkcy2wrbl1jaa38ivcjhqg596y"; - }; - - propagatedBuildInputs = [ pafy ]; - - # disabled due to error in loading unittest - # don't know how to make test from: - doCheck = false; - - # before check create a directory and redirect XDG_CONFIG_HOME to it - preCheck = '' - mkdir -p check-phase - export XDG_CONFIG_HOME=$(pwd)/check-phase - ''; - - meta = with lib; { - description = "Terminal based YouTube player and downloader"; - homepage = "https://github.com/mps-youtube/mps-youtube"; - license = licenses.gpl3; - maintainers = with maintainers; [ odi ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d29413530b9..91fd0aeaf01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20448,6 +20448,8 @@ in mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { }; + mps-youtube = callPackage ../applications/misc/mps-youtube { }; + mplayer = callPackage ../applications/video/mplayer ({ libdvdnav = libdvdnav_4_2_1; } // (config.mplayer or {})); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7451215072d..84672f06600 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6493,8 +6493,6 @@ in { maildir-deduplicate = callPackage ../development/python-modules/maildir-deduplicate { }; - mps-youtube = callPackage ../development/python-modules/mps-youtube { }; - d2to1 = callPackage ../development/python-modules/d2to1 { }; ovh = callPackage ../development/python-modules/ovh { }; -- cgit 1.4.1