From e6f42a91283e6f5c7f971a0e93fa3af12818a0f9 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Thu, 19 Sep 2024 22:31:29 -0400 Subject: [PATCH 1/2] support.sscan: 2-11-5 -> 2-11-6 --- pkgs/epnix/support/sscan/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/epnix/support/sscan/default.nix b/pkgs/epnix/support/sscan/default.nix index 542a04ab..d74282df 100644 --- a/pkgs/epnix/support/sscan/default.nix +++ b/pkgs/epnix/support/sscan/default.nix @@ -1,16 +1,14 @@ { - lib, epnixLib, mkEpicsPackage, fetchFromGitHub, - fetchpatch, epnix, local_config_site ? {}, local_release ? {}, }: mkEpicsPackage rec { pname = "sscan"; - version = "2-11-5"; + version = "2-11-6"; varname = "SSCAN"; inherit local_config_site local_release; @@ -19,9 +17,9 @@ mkEpicsPackage rec { src = fetchFromGitHub { owner = "epics-modules"; - repo = "sscan"; + repo = pname; rev = "R${version}"; - sha256 = "sha256-WVjQS4b4VBJezKqXqSFaiNLGjKUgoPqHPyNBvKKN77U="; + sha256 = "sha256-hrPap4FBKMD4ddMrADOeTAmsG+rLFxALibT3qsAHNsk="; }; meta = { From 9724618d2ab0b012a6911482968e3839b3ee448e Mon Sep 17 00:00:00 2001 From: Minijackson Date: Thu, 19 Sep 2024 22:31:54 -0400 Subject: [PATCH 2/2] support.sscan: reorder attributes --- pkgs/epnix/support/sscan/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/epnix/support/sscan/default.nix b/pkgs/epnix/support/sscan/default.nix index d74282df..2ff09596 100644 --- a/pkgs/epnix/support/sscan/default.nix +++ b/pkgs/epnix/support/sscan/default.nix @@ -11,10 +11,6 @@ mkEpicsPackage rec { version = "2-11-6"; varname = "SSCAN"; - inherit local_config_site local_release; - - buildInputs = with epnix.support; [seq]; - src = fetchFromGitHub { owner = "epics-modules"; repo = pname; @@ -22,6 +18,10 @@ mkEpicsPackage rec { sha256 = "sha256-hrPap4FBKMD4ddMrADOeTAmsG+rLFxALibT3qsAHNsk="; }; + buildInputs = with epnix.support; [seq]; + + inherit local_config_site local_release; + meta = { description = "Contains the sscan record and related software for systematically moving positioners, triggering detectors, and acquiring and storing resulting data"; homepage = "https://epics.anl.gov/bcda/synApps/sscan/sscan.html";