From d6c4f3a4d5658f940c8799cf08d9fd81ef34c133 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Aug 2023 04:40:20 +0000 Subject: [PATCH 1/4] python310Packages.bx-python: 0.9.0 -> 0.10.0 --- pkgs/development/python-modules/bx-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix index 085fc210f1b8..91924c46353e 100644 --- a/pkgs/development/python-modules/bx-python/default.nix +++ b/pkgs/development/python-modules/bx-python/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "bx-python"; - version = "0.9.0"; + version = "0.10.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bxlab"; repo = "bx-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Pi4hV3FatCXoXY3nNgqm5UfWYIrpP/v5PzzCi3gmIbE="; + hash = "sha256-j2GKj2IGDBk4LBnISRx6ZW/lh5VSdQBasC0gCRj0Fiw="; }; nativeBuildInputs = [ cython ]; From 9083fe415bd7f7296da127274de97ecda9c07d23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Aug 2023 09:37:36 +0200 Subject: [PATCH 2/4] python310Packages.bx-python: add changelog to meta --- pkgs/development/python-modules/bx-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix index 91924c46353e..3d26ca5078e8 100644 --- a/pkgs/development/python-modules/bx-python/default.nix +++ b/pkgs/development/python-modules/bx-python/default.nix @@ -29,9 +29,9 @@ buildPythonPackage rec { ''; meta = with lib; { + description = "Tools for manipulating biological data, particularly multiple sequence alignments"; homepage = "https://github.com/bxlab/bx-python"; - description = - "Tools for manipulating biological data, particularly multiple sequence alignments"; + changelog = "https://github.com/bxlab/bx-python/releases/tag/v${version}"; license = licenses.mit; maintainers = [ maintainers.jbedo ]; platforms = [ "x86_64-linux" ]; From 00c02166f5283f705c165668bc97e0f413723e19 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Aug 2023 09:39:30 +0200 Subject: [PATCH 3/4] python310Packages.bx-python: equalize content --- .../python-modules/bx-python/default.nix | 36 +++++++++++++++---- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix index 3d26ca5078e8..56a8a9a151e9 100644 --- a/pkgs/development/python-modules/bx-python/default.nix +++ b/pkgs/development/python-modules/bx-python/default.nix @@ -1,5 +1,14 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, numpy, cython, zlib, six -, python-lzo, nose }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, numpy +, cython +, zlib +, six +, python-lzo +, nose +}: buildPythonPackage rec { pname = "bx-python"; @@ -13,10 +22,23 @@ buildPythonPackage rec { hash = "sha256-j2GKj2IGDBk4LBnISRx6ZW/lh5VSdQBasC0gCRj0Fiw="; }; - nativeBuildInputs = [ cython ]; - buildInputs = [ zlib ]; - propagatedBuildInputs = [ numpy six python-lzo ]; - nativeCheckInputs = [ nose ]; + nativeBuildInputs = [ + cython + ]; + + buildInputs = [ + zlib + ]; + + propagatedBuildInputs = [ + numpy + six + python-lzo + ]; + + nativeCheckInputs = [ + nose + ]; postInstall = '' cp -r scripts/* $out/bin @@ -33,7 +55,7 @@ buildPythonPackage rec { homepage = "https://github.com/bxlab/bx-python"; changelog = "https://github.com/bxlab/bx-python/releases/tag/v${version}"; license = licenses.mit; - maintainers = [ maintainers.jbedo ]; + maintainers = with maintainers; [ jbedo ]; platforms = [ "x86_64-linux" ]; }; } From 8193aa415d442739a6bd022fff3b38706aadbd7b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Aug 2023 09:41:58 +0200 Subject: [PATCH 4/4] python310Packages.bx-python: update disabled - add format --- pkgs/development/python-modules/bx-python/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix index 56a8a9a151e9..5fc21676d261 100644 --- a/pkgs/development/python-modules/bx-python/default.nix +++ b/pkgs/development/python-modules/bx-python/default.nix @@ -5,7 +5,6 @@ , numpy , cython , zlib -, six , python-lzo , nose }: @@ -13,7 +12,9 @@ buildPythonPackage rec { pname = "bx-python"; version = "0.10.0"; - disabled = pythonOlder "3.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bxlab"; @@ -32,7 +33,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy - six python-lzo ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { postInstall = '' cp -r scripts/* $out/bin - # This is a small hack; the test suit uses the scripts which need to + # This is a small hack; the test suite uses the scripts which need to # be patched. Linking the patched scripts in $out back to the # working directory allows the tests to run rm -rf scripts