From 0fa9ee16e32a367da4e9e6faed1ba25849bc12fb Mon Sep 17 00:00:00 2001 From: Minijackson Date: Thu, 19 Sep 2024 22:21:51 -0400 Subject: [PATCH 1/2] support.calc: 3-7-4 -> 3-7-5 --- pkgs/epnix/support/calc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/epnix/support/calc/default.nix b/pkgs/epnix/support/calc/default.nix index e3a4cb8a..6b55bb37 100644 --- a/pkgs/epnix/support/calc/default.nix +++ b/pkgs/epnix/support/calc/default.nix @@ -8,7 +8,7 @@ }: mkEpicsPackage rec { pname = "calc"; - version = "3-7-4"; + version = "3-7-5"; varname = "CALC"; inherit local_config_site local_release; @@ -19,7 +19,7 @@ mkEpicsPackage rec { owner = "epics-modules"; repo = "calc"; rev = "R${version}"; - sha256 = "sha256-cZA9M60YAzCeBZB7amxQES6W4Bh1KFrm3ko7Js7Oa5I="; + sha256 = "sha256-S40HtO7HXDS27u7wmlxuo7oV1abtj1EaXfIz0Kj1IM0="; }; meta = { From 72f24b4992b4e38089ced1081957379025f5e256 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Thu, 19 Sep 2024 22:22:22 -0400 Subject: [PATCH 2/2] support.calc: reorder attributes --- pkgs/epnix/support/calc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/epnix/support/calc/default.nix b/pkgs/epnix/support/calc/default.nix index 6b55bb37..40a89a03 100644 --- a/pkgs/epnix/support/calc/default.nix +++ b/pkgs/epnix/support/calc/default.nix @@ -11,10 +11,6 @@ mkEpicsPackage rec { version = "3-7-5"; varname = "CALC"; - inherit local_config_site local_release; - - buildInputs = with epnix.support; [sscan]; - src = fetchFromGitHub { owner = "epics-modules"; repo = "calc"; @@ -22,6 +18,10 @@ mkEpicsPackage rec { sha256 = "sha256-S40HtO7HXDS27u7wmlxuo7oV1abtj1EaXfIz0Kj1IM0="; }; + buildInputs = with epnix.support; [sscan]; + + inherit local_config_site local_release; + meta = { description = "Support for run-time expression evaluation"; homepage = "https://epics.anl.gov/bcda/synApps/calc/calc.html";