From 7b862c3976aaf4eac688cd44e6dff83d2fa60966 Mon Sep 17 00:00:00 2001 From: kyehn Date: Sun, 31 Aug 2025 18:27:01 +0800 Subject: [PATCH 1/2] uhdm: 1.84-unstable-2024-11-12 -> 1.86 --- pkgs/by-name/uh/uhdm/package.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/uh/uhdm/package.nix b/pkgs/by-name/uh/uhdm/package.nix index ea59cedf155c..2622dff4d309 100644 --- a/pkgs/by-name/uh/uhdm/package.nix +++ b/pkgs/by-name/uh/uhdm/package.nix @@ -9,16 +9,15 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "UHDM"; - # When updating this package, also consider updating science/logic/surelog - version = "1.84-unstable-2024-11-12"; + pname = "uhdm"; + # When updating this package, also consider updating surelog + version = "1.86"; src = fetchFromGitHub { owner = "chipsalliance"; repo = "UHDM"; - # After we're back on a stable tag, use v${finalAttrs.version} - rev = "7d90dd0e68759775d0c86885d991925096b5b496"; - hash = "sha256-msdtBAlOXwYJd0HhWmVo8oMJ6h8OUmy0ILxV1MV52PE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-f7QJJEP/jL69DdMJOL5WQdDZU+kBnnLi2eX37AoaXls="; fetchSubmodules = false; # we use all dependencies from nix }; @@ -38,7 +37,14 @@ stdenv.mkDerivation (finalAttrs: { ]; doCheck = true; - checkPhase = "make test"; + + checkPhase = '' + runHook preCheck + + make test + + runHook postCheck + ''; meta = { description = "Universal Hardware Data Model"; From e76092ed348485e0aed52213619f62697826016e Mon Sep 17 00:00:00 2001 From: kyehn Date: Sun, 31 Aug 2025 18:28:37 +0800 Subject: [PATCH 2/2] surelog: 1.84-unstable-2024-12-06 -> 1.86 --- pkgs/by-name/su/surelog/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/su/surelog/package.nix b/pkgs/by-name/su/surelog/package.nix index f7c9cb8d8e92..8c468f40e21b 100644 --- a/pkgs/by-name/su/surelog/package.nix +++ b/pkgs/by-name/su/surelog/package.nix @@ -17,14 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "surelog"; - version = "1.84-unstable-2024-12-06"; + version = "1.86"; src = fetchFromGitHub { owner = "chipsalliance"; repo = "surelog"; - # Once we're back on a stable tag, use "v$(finalAttrs.version}" below. - rev = "298a9cddc672cce7f25ec352f9f8f36f5b23aa4e"; - hash = "sha256-Qv4dosj2dwakNCcvu483ZMuw+LlYs4fhZTULszERLSI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-EEhaYimyzOgQB7dxbbTfsa7APC6SlFkz9ah9BLcKDq4="; fetchSubmodules = false; # we use all dependencies from nix };