From c48b99782d57da9e4ff9d194f3efe0d622f6de71 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Mon, 2 Jun 2025 10:32:32 +0200 Subject: [PATCH] mempool: fix version Remove `v` prefix of mempool drv versions: `v2.5.0` -> `2.5.0` --- pkgs/mempool/default.nix | 7 ++++--- pkgs/mempool/generate.sh | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/mempool/default.nix b/pkgs/mempool/default.nix index 1a45785..8270b85 100644 --- a/pkgs/mempool/default.nix +++ b/pkgs/mempool/default.nix @@ -14,10 +14,12 @@ rec { nodejs = nodejs-18_x; nodejsRuntime = nodejs-slim-18_x; + version = "2.5.0"; + src = fetchFromGitHub { owner = "mempool"; repo = "mempool"; - rev = "v2.5.0"; + tag = "v${version}"; hash = "sha256-8HmfytxRte3fQ0QKOljUVk9YAuaXhQQWuv3EFNmOgfQ="; }; @@ -108,8 +110,7 @@ rec { sync = "${rsync}/bin/rsync -a --inplace"; mkDerivationMempool = args: stdenvNoCC.mkDerivation ({ - version = src.rev; - inherit src meta; + inherit version src meta; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/mempool/generate.sh b/pkgs/mempool/generate.sh index f491a04..7fce668 100755 --- a/pkgs/mempool/generate.sh +++ b/pkgs/mempool/generate.sh @@ -40,9 +40,9 @@ updateSrc() { hash=$(nix hash path "$src") sed -i " + s|\bversion = .*;|version = \"$version\";| s|\bowner = .*;|owner = \"$owner\";| - s|\brev = .*;|rev = \"$rev\";| - s|\bhash = .*;|hash = \"$hash\";| + /fetchFromGitHub/,/hash/ s|\bhash = .*;|hash = \"$hash\";| " default.nix }