From ef232d59ac5fc448714898783ff17603177a9c68 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 15 Sep 2024 22:02:31 +0000 Subject: [PATCH] fetchcvs: support `hash` attribute --- pkgs/build-support/fetchcvs/default.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/build-support/fetchcvs/default.nix b/pkgs/build-support/fetchcvs/default.nix index 43a10c3aa552..94bbc69bba65 100644 --- a/pkgs/build-support/fetchcvs/default.nix +++ b/pkgs/build-support/fetchcvs/default.nix @@ -6,17 +6,18 @@ {stdenvNoCC, cvs, openssh, lib}: lib.makeOverridable ( -{cvsRoot, module, tag ? null, date ? null, sha256}: + lib.fetchers.withNormalizedHash { } ( + {cvsRoot, module, tag ? null, date ? null, outputHash, outputHashAlgo}: -stdenvNoCC.mkDerivation { - name = "cvs-export"; - builder = ./builder.sh; - nativeBuildInputs = [cvs openssh]; + stdenvNoCC.mkDerivation { + name = "cvs-export"; + builder = ./builder.sh; + nativeBuildInputs = [cvs openssh]; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = sha256; + inherit outputHash outputHashAlgo; + outputHashMode = "recursive"; - inherit cvsRoot module sha256 tag date; -} + inherit cvsRoot module tag date; + } + ) )