From 016d7891e95afb5d3e4d2eb59f7e701c2edd1e97 Mon Sep 17 00:00:00 2001 From: alyaeanyx Date: Thu, 30 Nov 2023 09:05:31 +0100 Subject: [PATCH 1/3] {libqalculate, qalculate-gtk, qalculate-qt}: 4.8.1 -> 4.9.0 --- pkgs/applications/science/math/qalculate-gtk/default.nix | 4 ++-- pkgs/applications/science/math/qalculate-qt/default.nix | 4 ++-- pkgs/development/libraries/libqalculate/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index ade614c89b0fb..0ba584875e517 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-gtk"; - version = "4.8.1"; + version = "4.9.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-bG0hui5GjHWHny/8Rq5sZGz3s5rYnYlpc+K8I/LwDto="; + sha256 = "sha256-rQxOOxM4TazkDs/H3KEPbdo6WBl0ptyAlZwv8nnGMss="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index adc43b5f9dab2..93abb0dda36dd 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-qt"; - version = "4.8.1"; + version = "4.9.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${finalAttrs.version}"; - hash = "sha256-hH+orU+5PmPcrhkLKCdsDhVCrD8Mvxp2RPTGSlsUP7Y="; + hash = "sha256-Ac8RRxLheaenlR7JqKzfBpPxsq7PHfE9qXFf3Vx4GSg="; }; nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ]; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 87e3049c6c852..2502673b398ea 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libqalculate"; - version = "4.8.1"; + version = "4.9.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-4WqKlwVf4/ixVr98lPFVfNL6EOIfHHfL55xLsYqxkhY="; + sha256 = "sha256-6W65dg2pZeio3ZVgVLQZrz/eReYcPiYf52zjcaRfE8E="; }; outputs = [ "out" "dev" "doc" ]; From 90a5c36a854f6965115a6f6a6c1b6bf122dccb20 Mon Sep 17 00:00:00 2001 From: alyaeanyx Date: Thu, 30 Nov 2023 09:48:44 +0100 Subject: [PATCH 2/3] {libqalculate, qalculate-gtk}: change sha256 attribute to hash --- pkgs/applications/science/math/qalculate-gtk/default.nix | 2 +- pkgs/development/libraries/libqalculate/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 0ba584875e517..09b4701415507 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-rQxOOxM4TazkDs/H3KEPbdo6WBl0ptyAlZwv8nnGMss="; + hash = "sha256-rQxOOxM4TazkDs/H3KEPbdo6WBl0ptyAlZwv8nnGMss="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 2502673b398ea..84623e7459fca 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "qalculate"; repo = "libqalculate"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-6W65dg2pZeio3ZVgVLQZrz/eReYcPiYf52zjcaRfE8E="; + hash = "sha256-6W65dg2pZeio3ZVgVLQZrz/eReYcPiYf52zjcaRfE8E="; }; outputs = [ "out" "dev" "doc" ]; From 08cdc6a005fd3e6936f862d4d29cedb212d9daa2 Mon Sep 17 00:00:00 2001 From: alyaeanyx Date: Thu, 7 Dec 2023 20:19:52 +0100 Subject: [PATCH 3/3] qalculate-{gtk, qt}: add meta.mainProgram --- pkgs/applications/science/math/qalculate-gtk/default.nix | 1 + pkgs/applications/science/math/qalculate-qt/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 09b4701415507..0c859fd95bea7 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://qalculate.github.io"; maintainers = with maintainers; [ gebner doronbehar alyaeanyx ]; license = licenses.gpl2Plus; + mainProgram = "qalculate-gtk"; platforms = platforms.all; }; }) diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index 93abb0dda36dd..9932c7c2dcd91 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://qalculate.github.io"; maintainers = with maintainers; [ _4825764518 ]; license = licenses.gpl2Plus; + mainProgram = "qalculate-qt"; platforms = platforms.unix; }; })