From d504d6d39d15dc73fec26ce85119e2c882e53119 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Thu, 19 Sep 2024 22:10:08 -0400 Subject: [PATCH 1/2] support.StreamDevice: 2.8.24 -> 2.8.26 --- pkgs/epnix/support/StreamDevice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/epnix/support/StreamDevice/default.nix b/pkgs/epnix/support/StreamDevice/default.nix index 1c8bd810..806d425c 100644 --- a/pkgs/epnix/support/StreamDevice/default.nix +++ b/pkgs/epnix/support/StreamDevice/default.nix @@ -8,7 +8,7 @@ local_config_site ? {}, local_release ? {}, }: let - version = "2.8.24"; + version = "2.8.26"; in mkEpicsPackage { pname = "StreamDevice"; @@ -39,7 +39,7 @@ in # export-subst in .gitattributes for .VERSION # See: https://epics.anl.gov/tech-talk/2022/msg01842.php forceFetchGit = true; - hash = "sha256-2MJ6CSNFc5rKijx5TFwwXStzj6zypS4cpMrcSuW4+F0="; + hash = "sha256-/OgjdHvFr6sBRhOLa9F3KJeaxMiKuUuBduHUc4YLYBI="; }; meta = { From 9f6cab61ef07ca69e53b561adab994f33b1250b6 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Thu, 19 Sep 2024 22:14:34 -0400 Subject: [PATCH 2/2] support.StreamDevice: reorder attributes --- pkgs/epnix/support/StreamDevice/default.nix | 30 ++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/epnix/support/StreamDevice/default.nix b/pkgs/epnix/support/StreamDevice/default.nix index 806d425c..e0e6c5c1 100644 --- a/pkgs/epnix/support/StreamDevice/default.nix +++ b/pkgs/epnix/support/StreamDevice/default.nix @@ -15,6 +15,21 @@ in inherit version; varname = "STREAM"; + src = fetchFromGitHub { + owner = "paulscherrerinstitute"; + repo = "StreamDevice"; + rev = version; + # Tarball from GitHub is not completely reproducible due to usage of + # export-subst in .gitattributes for .VERSION + # See: https://epics.anl.gov/tech-talk/2022/msg01842.php + forceFetchGit = true; + hash = "sha256-/OgjdHvFr6sBRhOLa9F3KJeaxMiKuUuBduHUc4YLYBI="; + }; + + nativeBuildInputs = [pcre]; + buildInputs = [pcre] ++ (with epnix.support; [sscan]); + propagatedBuildInputs = with epnix.support; [asyn calc]; + inherit local_config_site; local_release = local_release @@ -27,21 +42,6 @@ in STREAM = null; }; - nativeBuildInputs = [pcre]; - buildInputs = [pcre] ++ (with epnix.support; [sscan]); - propagatedBuildInputs = with epnix.support; [asyn calc]; - - src = fetchFromGitHub { - owner = "paulscherrerinstitute"; - repo = "StreamDevice"; - rev = version; - # Tarball from GitHub is not completely reproducible due to usage of - # export-subst in .gitattributes for .VERSION - # See: https://epics.anl.gov/tech-talk/2022/msg01842.php - forceFetchGit = true; - hash = "sha256-/OgjdHvFr6sBRhOLa9F3KJeaxMiKuUuBduHUc4YLYBI="; - }; - meta = { description = "A generic EPICS device support for devices with a \"byte stream\" based communication interface"; homepage = "https://paulscherrerinstitute.github.io/StreamDevice/";