Unverified Commit a587e45f authored by Sam's avatar Sam
Browse files

scrutiny{,-collector}: convert to finalAttrs 

I'm aware that the `frontend` block in the scrutiny let-in looks a
little weird, but it means that doing `overrideAttrs` on scrutiny (to
override version and src) will affect the webapp.
parent e513a9da

pkgs/by-name/sc/scrutiny-collector/package.nix

+5 −6
Original line number Diff line number Diff line
@@ -7,17 +7,15 @@ 
  lib,

  nix-update-script,

}:

let



buildGoModule (finalAttrs: {

  version = "0.9.1";

in

buildGoModule rec {

  inherit version;

  pname = "scrutiny-collector";



  src = fetchFromGitHub {

    owner = "AnalogJ";

    repo = "scrutiny";

    tag = "v${version}";

    tag = "v${finalAttrs.version}";

    hash = "sha256-xEMHkISPBHinT6vRyrWPudvmTiX5gYxMkCEoSm2gLWA=";

  };
@@ -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

+31 −31
Original line number Diff line number Diff line
@@ -7,20 +7,12 @@ 
  nix-update-script,

}:

let

  pname = "scrutiny";

  version = "0.9.1";



  src = fetchFromGitHub {

    owner = "AnalogJ";

    repo = "scrutiny";

    tag = "v${version}";

    hash = "sha256-xEMHkISPBHinT6vRyrWPudvmTiX5gYxMkCEoSm2gLWA=";

  };



  frontend = buildNpmPackage {

    inherit version;

    pname = "${pname}-webapp";

    src = "${src}/webapp/frontend";

  frontend =

    finalAttrs:

    buildNpmPackage {

      inherit (finalAttrs) version;

      pname = "${finalAttrs.pname}-webapp";

      src = "${finalAttrs.src}/webapp/frontend";



      npmDepsHash = "sha256-1lOskHEU/3CmhQkUkQExryK6eMOSWvMI+Y+cX4Dlj98=";
@@ -41,8 +33,16 @@ let 
      passthru.updateScript = nix-update-script { };

    };

in

buildGoModule rec {

  inherit pname src version;

buildGoModule (finalAttrs: {

  pname = "scrutiny";

  version = "0.9.1";



  src = fetchFromGitHub {

    owner = "AnalogJ";

    repo = "scrutiny";

    tag = "v${finalAttrs.version}";

    hash = "sha256-xEMHkISPBHinT6vRyrWPudvmTiX5gYxMkCEoSm2gLWA=";

  };



  subPackages = "webapp/backend/cmd/scrutiny";
@@ -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;

  };

}
 
})