Unverified Commit 2bc847c8 authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

Merge pull request #241325 from alyaeanyx/qalculate-4.7.0 

{libqalculate, qalculate-gtk, qalculate-qt}: 4.6.1 -> 4.7.0
parents 6c0f3dee 2ae8e338

pkgs/applications/science/math/qalculate-gtk/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


stdenv.mkDerivation rec {

  pname = "qalculate-gtk";

  version = "4.6.1";

  version = "4.7.0";



  src = fetchFromGitHub {

    owner = "qalculate";

    repo = "qalculate-gtk";

    rev = "v${version}";

    sha256 = "sha256-eBclDq9Uiu5rA74tlBkOiP3fRwAZn84F3LPA2cKkuw8=";

    sha256 = "sha256-Fbi+vZEyXhUZQjWUX01IXd6G1cthfiuztdbisNQ/VZU=";

  };



  hardeningDisable = [ "format" ];

pkgs/applications/science/math/qalculate-qt/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -2,17 +2,17 @@ 


stdenv.mkDerivation rec {

  pname = "qalculate-qt";

  version = "4.6.1";

  version = "4.7.0";



  src = fetchFromGitHub {

    owner = "qalculate";

    repo = "qalculate-qt";

    rev = "v${version}";

    hash = "sha256-9DT1U0iKj5C/Tc9MggEr/RwHhVr4GSOJQVhTiLFk9NY=";

    hash = "sha256-fMchJgxuOO2e7cOHLako26c9gsWvQY2MTRVD3JWGSAU=";

  };



  nativeBuildInputs = [ qmake intltool pkg-config wrapQtAppsHook ];

  buildInputs = [ libqalculate qtbase qttools qtsvg ]

  nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ];

  buildInputs = [ libqalculate qtbase qtsvg ]

    ++ lib.optionals stdenv.isLinux [ qtwayland ];



  postPatch = ''

pkgs/development/libraries/libqalculate/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ 


stdenv.mkDerivation rec {

  pname = "libqalculate";

  version = "4.6.1";

  version = "4.7.0";



  src = fetchFromGitHub {

    owner = "qalculate";

    repo = "libqalculate";

    rev = "v${version}";

    sha256 = "sha256-GOVSNEnEl/oef54q88s+YuLyqPMLyx1eoX7DlWrmo2c=";

    sha256 = "sha256-Wgy1vsr0FXRJz9BCfw2PyFkesIJ/eg2dYDY/I2TESnU=";

  };



  outputs = [ "out" "dev" "doc" ];