gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scrutiny{,-collector}: 0.9.0 -> 0.9.1; convert to finalAttrs (#513448)

Browse Source
This commit is contained in:
Michael Daniels
2026-04-26 23:25:01 +00:00
committed by GitHub
parent 10fe402013 a587e45f4f
commit e6dacacd78
2 changed files with 42 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/sc/scrutiny-collector/package.nix
+8 -9
View File
@@ -7,23 +7,21 @@
lib,
nix-update-script,
}:
let
version = "0.9.0";
in
buildGoModule rec {
inherit version;
buildGoModule (finalAttrs: {
version = "0.9.1";
pname = "scrutiny-collector";
src = fetchFromGitHub {
owner = "AnalogJ";
repo = "scrutiny";
tag = "v${version}";
hash = "sha256-N6CYVhdA0BWewGUxyHtkW1ZFDGBYI7QfUo5er7xRcFw=";
tag = "v${finalAttrs.version}";
hash = "sha256-xEMHkISPBHinT6vRyrWPudvmTiX5gYxMkCEoSm2gLWA=";
};
subPackages = "collector/cmd/collector-metrics";
vendorHash = "sha256-fyHWy1TwwzFMIFzwilu4osfl/iI+2KqI6Bjr1UYUS68=";
vendorHash = "sha256-Em8k2AFoZv4TD4HFkkNIdyPj7IBOFiUIKffkifWfZFY=";
nativeBuildInputs = [ makeWrapper ];
@@ -48,6 +46,7 @@ buildGoModule rec {
meta = {
description = "Hard disk metrics collector for Scrutiny";
homepage = "https://github.com/AnalogJ/scrutiny";
changelog = "https://github.com/AnalogJ/scrutiny/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
samasaur
@@ -55,4 +54,4 @@ buildGoModule rec {
];
mainProgram = "scrutiny-collector-metrics";
};
}
})
pkgs/by-name/sc/scrutiny/package.nix
+34 -34
View File
@@ -7,46 +7,46 @@
nix-update-script,
}:
let
frontend =
finalAttrs:
buildNpmPackage {
inherit (finalAttrs) version;
pname = "${finalAttrs.pname}-webapp";
src = "${finalAttrs.src}/webapp/frontend";
npmDepsHash = "sha256-1lOskHEU/3CmhQkUkQExryK6eMOSWvMI+Y+cX4Dlj98=";
buildPhase = ''
runHook preBuild
mkdir dist
npm run build:prod --offline -- --output-path=dist
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir $out
cp -r dist/* $out
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
};
in
buildGoModule (finalAttrs: {
pname = "scrutiny";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "AnalogJ";
repo = "scrutiny";
tag = "v${version}";
hash = "sha256-N6CYVhdA0BWewGUxyHtkW1ZFDGBYI7QfUo5er7xRcFw=";
tag = "v${finalAttrs.version}";
hash = "sha256-xEMHkISPBHinT6vRyrWPudvmTiX5gYxMkCEoSm2gLWA=";
};
frontend = buildNpmPackage {
inherit version;
pname = "${pname}-webapp";
src = "${src}/webapp/frontend";
npmDepsHash = "sha256-1lOskHEU/3CmhQkUkQExryK6eMOSWvMI+Y+cX4Dlj98=";
buildPhase = ''
runHook preBuild
mkdir dist
npm run build:prod --offline -- --output-path=dist
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir $out
cp -r dist/* $out
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
};
in
buildGoModule rec {
inherit pname src version;
subPackages = "webapp/backend/cmd/scrutiny";
vendorHash = "sha256-fyHWy1TwwzFMIFzwilu4osfl/iI+2KqI6Bjr1UYUS68=";
vendorHash = "sha256-Em8k2AFoZv4TD4HFkkNIdyPj7IBOFiUIKffkifWfZFY=";
env.CGO_ENABLED = 0;
@@ -56,7 +56,7 @@ buildGoModule rec {
postInstall = ''
mkdir -p $out/share/scrutiny
cp -r ${frontend}/* $out/share/scrutiny
cp -r ${frontend finalAttrs}/* $out/share/scrutiny
'';
passthru.tests.scrutiny = nixosTests.scrutiny;
@@ -65,7 +65,7 @@ buildGoModule rec {
meta = {
description = "Hard Drive S.M.A.R.T Monitoring, Historical Trends & Real World Failure Thresholds";
homepage = "https://github.com/AnalogJ/scrutiny";
changelog = "https://github.com/AnalogJ/scrutiny/releases/tag/v${version}";
changelog = "https://github.com/AnalogJ/scrutiny/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
samasaur
@@ -74,4 +74,4 @@ buildGoModule rec {
mainProgram = "scrutiny";
platforms = lib.platforms.linux;
};
}
})