From 6996896b4882c0dde1b42d83182f7a2ac9a35edf Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 19 May 2021 16:35:59 +0200 Subject: [PATCH] bcal: cleanup package, enable aarch64-darwin build --- .../science/math/bcal/default.nix | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix index 8cbf90a7187..1494b532487 100644 --- a/pkgs/applications/science/math/bcal/default.nix +++ b/pkgs/applications/science/math/bcal/default.nix @@ -1,6 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, readline, bc }: - -with lib; +{ lib +, stdenv +, fetchFromGitHub +, readline +, bc +, python3Packages +}: stdenv.mkDerivation rec { pname = "bcal"; @@ -13,23 +17,21 @@ stdenv.mkDerivation rec { sha256 = "4vR5rcbNkoEdSRNoMH9qMHP3iWFxejkVfXNiYfwbo/A="; }; - nativeBuildInputs = [ python3Packages.pytest ]; - buildInputs = [ readline ]; + installFlags = [ "PREFIX=$(out)" ]; + doCheck = true; - checkInputs = [ bc ]; - checkPhase = '' - python3 -m pytest test.py - ''; - installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + checkInputs = [ bc python3Packages.pytestCheckHook ]; - meta = { + pytestFlagsArray = [ "test.py" ]; + + meta = with lib; { description = "Storage conversion and expression calculator"; homepage = "https://github.com/jarun/bcal"; license = licenses.gpl3Only; - platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ jfrankenau ]; }; }