public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #36873 from jfrankenau/update-bcal

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/science/math/bcal/default.nix
View File

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

4
pkgs/top-level/all-packages.nix
View File

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