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

Merge pull request #330480 from codifryed/coolercontrol 

coolercontrol.*: 1.3.0 -> 1.4.0
parents b854c515 8646b99d

pkgs/applications/system/coolercontrol/Cargo.lock

+1589 −3080

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/system/coolercontrol/coolercontrol-gui.nix

+6 −11
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ 
, dbus

, freetype

, gtk3

, libsoup

, libsoup_3

, openssl

, pkg-config

, webkitgtk

, webkitgtk_4_1

, libappindicator

, makeWrapper

, coolercontrol
@@ -23,12 +23,7 @@ rustPlatform.buildRustPackage { 
  inherit version src;

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



  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "tauri-plugin-localhost-0.1.0" = "sha256-Mf2/cnKotd751ZcSHfiSLNe2nxBfo4dMBdoCwQhe7yI=";

    };

  };

  cargoHash = "sha256-0Ud5S4T5+5eBuvD5N64NAvbK0+tTozKsPhsNziCEu3I=";



  buildFeatures = [ "custom-protocol" ];
@@ -41,9 +36,9 @@ rustPlatform.buildRustPackage { 
    dbus

    openssl

    freetype

    libsoup

    libsoup_3

    gtk3

    webkitgtk

    webkitgtk_4_1

    libappindicator

  ];
@@ -54,7 +49,7 @@ rustPlatform.buildRustPackage { 
  postPatch = ''

    mkdir -p ui-build

    cp -R ${coolercontrol.coolercontrol-ui-data}/* ui-build/

    substituteInPlace tauri.conf.json --replace '"distDir": "../dist"' '"distDir": "ui-build"'

    substituteInPlace tauri.conf.json --replace '"frontendDist": "../dist"' '"frontendDist": "ui-build"'

  '';



  postInstall = ''

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

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

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



  npmDepsHash = "sha256-gnJvNQCbqFfPfsqi008HW4kBTpxiVpN7eHyn9bU6if8=";

  npmDepsHash = "sha256-PpX9lk+yEG1auvBv5JBdMh7rjWoM0oTYJx6Nme5ij8s=";



  postBuild = ''

    cp -r dist $out

pkgs/applications/system/coolercontrol/coolercontrold.nix

+11 −1
Original line number Diff line number Diff line 
{ rustPlatform

, buildNpmPackage

, testers

, libdrm

, coolercontrol

, runtimeShell

}:
@@ -15,7 +16,16 @@ rustPlatform.buildRustPackage { 
  inherit version src;

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



  cargoHash = "sha256-CuA8r54O33csmSY67/AOlQQqUniAWkgWSewIBdeq7X4=";

  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "nvml-wrapper-0.10.0" = "sha256-pMiULWT+nJXcDfLDeACG/DaPF5+AbzpoIUWWWz8mQ+0=";

    };

  };



  buildInputs = [

    libdrm

  ];



  postPatch = ''

    # copy the frontend static resources to a directory for embedding

pkgs/applications/system/coolercontrol/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ 
}:



let

  version = "1.3.0";

  version = "1.4.0";



  src = fetchFromGitLab {

    owner = "coolercontrol";

    repo = "coolercontrol";

    rev = version;

    hash = "sha256-0NYDPJNX0kWIBHv+b4GuK6efgHCBNDu3rBXaQ/iSxFk=";

    hash = "sha256-jsgso9MHt5Szzp9YkuXz8qysdN0li/zD2R/vSZ2Lw5M=";

  };



  meta = with lib; {