From 58a5d0783e0d640ca9fb510ce5d53140ba00299e Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 2 Feb 2017 09:13:54 +0800 Subject: [PATCH] speedcrunch: 0.11 -> 0.12.0 Also: - build against qt5 instead of qt4 --- .../science/math/speedcrunch/default.nix | 20 +++++++++++-------- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix index 56ae454831b1..334423660a03 100644 --- a/pkgs/applications/science/math/speedcrunch/default.nix +++ b/pkgs/applications/science/math/speedcrunch/default.nix @@ -1,19 +1,23 @@ -{ stdenv, fetchurl, qt, cmake }: +{ stdenv, fetchgit, cmake, qtbase, qttools }: stdenv.mkDerivation rec { name = "speedcrunch-${version}"; - version = "0.11"; + version = "0.12.0"; - src = fetchurl { - url = "https://bitbucket.org/heldercorreia/speedcrunch/get/${version}.tar.gz"; - sha256 = "0phba14z9jmbmax99klbxnffwzv3awlzyhpcwr1c9lmyqnbcsnkd"; + src = fetchgit { + # the tagging is not standard, so you probably need to check this when updating + rev = "refs/tags/release-${version}"; + url = "https://bitbucket.org/heldercorreia/speedcrunch"; + sha256 = "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk"; }; - buildInputs = [cmake qt]; + buildInputs = [ qtbase qttools ]; - dontUseCmakeBuildDir = true; + nativeBuildInputs = [ cmake ]; - cmakeDir = "src"; + preConfigure = '' + cd src + ''; meta = with stdenv.lib; { homepage = http://speedcrunch.org; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28668e0fc1c2..4fe4d1b07feb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17254,11 +17254,7 @@ with pkgs; yacas = callPackage ../applications/science/math/yacas { }; - speedcrunch = callPackage ../applications/science/math/speedcrunch { - qt = qt4; - cmake = cmakeCurses; - }; - + speedcrunch = qt5.callPackage ../applications/science/math/speedcrunch { }; ### SCIENCE / MISC