Unverified Commit a5500202 authored by Cosima Neidahl's avatar Cosima Neidahl Committed by GitHub
Browse files

coolercontrol: 3.1.1 -> 4.1.0 (#500680)

parents c5a11ba8 a69626f5

pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ buildNpmPackage { 
  inherit version src;

  sourceRoot = "${src.name}/coolercontrol-ui";



  npmDepsHash = "sha256-crkAK9k7wwbjiAQGBK584/29Zi0TZlljuASdvni8RkQ=";

  npmDepsFetcherVersion = 2;

  npmDepsHash = "sha256-AzRw6DuloOFC7VN7yM9czqxosfVIoXAltv2xHUxac7k=";



  postBuild = ''

    cp -r dist $out

pkgs/applications/system/coolercontrol/coolercontrold.nix

+7 −2
Original line number Diff line number Diff line 
{

  rustPlatform,

  testers,

  hwdata,

  libdrm,

  coolercontrol,

  runtimeShell,
@@ -21,7 +22,7 @@ rustPlatform.buildRustPackage { 
  inherit version src;

  sourceRoot = "${src.name}/coolercontrold";



  cargoHash = "sha256-5YYodScAAs6ERVbj+irvyNS9IOkVaBHR4DCXTrrtyVI=";

  cargoHash = "sha256-rFwbHsGkKLD9UgkdTbxMIjARmU0Ewal1NIwlbzRL/vc=";



  buildInputs = [ libdrm ];
@@ -39,8 +40,12 @@ rustPlatform.buildRustPackage { 
    cp -R ${coolercontrol.coolercontrol-ui-data}/* resources/app/



    # Hardcode a shell

    substituteInPlace src/repositories/utils.rs \

    substituteInPlace daemon/src/repositories/utils.rs \

      --replace-fail 'Command::new("sh")' 'Command::new("${runtimeShell}")'



    # This is supposed to be a "nix-compatible file path", but there is nothing that actually does the substitution

    substituteInPlace daemon/src/repositories/hwmon/pci_ids.rs \

      --replace-fail '@hwdata@' '${hwdata}'

  '';



  postInstall = ''

pkgs/applications/system/coolercontrol/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ 
}:



let

  version = "3.1.1";

  version = "4.1.0";



  src = fetchFromGitLab {

    owner = "coolercontrol";

    repo = "coolercontrol";

    rev = version;

    hash = "sha256-ocGW55z/cbO7uXWxiHoE798hN56fLlSgmZkO507eruY=";

    tag = version;

    hash = "sha256-v1enPMezagA3gcYD5EbC1ecTOXEsMLRGWIKzgDxzRWg=";

  };



  meta = {