Merge pull request #36873 from jfrankenau/update-bcal

bcal: 1.7 -> 1.8
This commit is contained in:
Daiderd Jordan 2018-03-12 19:49:20 +01:00 committed by GitHub
commit a6bf2b21d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions

View File

@ -4,30 +4,29 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "bcal-${version}";
version = "1.7";
version = "1.8";
src = fetchFromGitHub {
owner = "jarun";
repo = "bcal";
rev = "v${version}";
sha256 = "08cqp2jysvy743gmwpzkbqhybsb49n65r63z3if53m3y59qg4aw8";
sha256 = "0jdn46wzwq7yn3x6p1xyqarp52pcr0ghnfhkm7nyxv734g1abw7r";
};
nativeBuildInputs = [ python3Packages.pytest ];
doCheck = !stdenv.isDarwin;
doCheck = true;
checkPhase = ''
python3 -m pytest test.py
'';
makeFlags = [ "CC=cc" ];
installFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
meta = {
description = "Storage conversion and expression calculator";
homepage = https://github.com/jarun/bcal;
license = licenses.gpl3;
platforms = [ "x86_64-darwin" "x86_64-linux" ];
platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ];
maintainers = with maintainers; [ jfrankenau ];
};
}

View File

@ -19947,9 +19947,7 @@ with pkgs;
pcalc = callPackage ../applications/science/math/pcalc { };
bcal = callPackage ../applications/science/math/bcal {
stdenv = gccStdenv;
};
bcal = callPackage ../applications/science/math/bcal { };
pspp = callPackage ../applications/science/math/pspp {
inherit (gnome3) gtksourceview;