diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-08-04 15:17:42 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-08-04 15:17:42 +0300 |
commit | 008fd5fcf5f45c6478ccd3d52ec923052eccb932 (patch) | |
tree | 14d454f88bd0f02fe550ba5b68d987573e8820fc /pkgs/applications/science | |
parent | 7a337cde318020a0f91702bfefee85a7b31be06f (diff) | |
parent | 20f1388c3fb7c1c56367fd96fd21cfd316f465b7 (diff) | |
download | nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar.gz nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar.bz2 nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar.lz nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar.xz nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar.zst nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/biology/somatic-sniper/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/math/almonds/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/science/math/bcal/default.nix | 8 |
3 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/applications/science/biology/somatic-sniper/default.nix b/pkgs/applications/science/biology/somatic-sniper/default.nix index adc8648c6980..4bbd6a320035 100644 --- a/pkgs/applications/science/biology/somatic-sniper/default.nix +++ b/pkgs/applications/science/biology/somatic-sniper/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ cmake zlib ncurses ]; + enableParallelBuilding = false; + meta = with stdenv.lib; { description = "Identify single nucleotide positions that are different between tumor and normal"; license = licenses.mit; diff --git a/pkgs/applications/science/math/almonds/default.nix b/pkgs/applications/science/math/almonds/default.nix index fb76699b0c83..96613f4e38a6 100644 --- a/pkgs/applications/science/math/almonds/default.nix +++ b/pkgs/applications/science/math/almonds/default.nix @@ -1,11 +1,9 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, ncurses, pillow, pytest }: +{ stdenv, python3, fetchFromGitHub, ncurses }: -let +with python3.pkgs; buildPythonApplication rec { + pname = "almonds"; version = "1.25b"; -in -buildPythonApplication { - name = "almonds-${version}"; src = fetchFromGitHub { owner = "Tenchi2xh"; repo = "Almonds"; diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix index 8db4bd157df6..61eb1fd3ce4e 100644 --- a/pkgs/applications/science/math/bcal/default.nix +++ b/pkgs/applications/science/math/bcal/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ stdenv, fetchFromGitHub, python3Packages, readline }: with stdenv.lib; stdenv.mkDerivation rec { name = "bcal-${version}"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "jarun"; repo = "bcal"; rev = "v${version}"; - sha256 = "0jdn46wzwq7yn3x6p1xyqarp52pcr0ghnfhkm7nyxv734g1abw7r"; + sha256 = "0h6qi5rvzl6c6fsfdpdb3l4jcgip03l18i0b1x08z1y89i56y8mm"; }; nativeBuildInputs = [ python3Packages.pytest ]; + buildInputs = [ readline ]; + doCheck = true; checkPhase = '' python3 -m pytest test.py |