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

coolercontrol.*: 1.4.0 -> 1.4.4 (#358289)

parents fe1509dc 029b8c50

pkgs/applications/system/coolercontrol/Cargo.lock

deleted100644 → 0
+0 −3548

File deleted.

Preview size limit exceeded, changes collapsed.

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

+19 −17
Original line number Diff line number Diff line 
{ lib

, rustPlatform

, dbus

, freetype

, gtk3

, libsoup_3

, openssl

, pkg-config

, webkitgtk_4_1

, libappindicator

, makeWrapper

, coolercontrol

{

  lib,

  rustPlatform,

  dbus,

  freetype,

  gtk3,

  libsoup_3,

  openssl,

  pkg-config,

  webkitgtk_4_1,

  libappindicator,

  makeWrapper,

  coolercontrol,

}:



{ version

, src

, meta

{

  version,

  src,

  meta,

}:



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

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



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

  cargoHash = "sha256-nS67ABuI2/C08X+TWWoOx7bptIPF1fsvBC1Ucoky1/4=";



  buildFeatures = [ "custom-protocol" ];
@@ -48,7 +50,7 @@ rustPlatform.buildRustPackage { 
  postPatch = ''

    mkdir -p ui-build

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

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

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

  '';



  postInstall = ''

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

+7 −9
Original line number Diff line number Diff line 
{ python3

}:

{ python3 }:



{ version

, src

, meta

{

  version,

  src,

  meta,

}:



python3.pkgs.buildPythonApplication {
@@ -12,9 +12,7 @@ python3.pkgs.buildPythonApplication { 
  sourceRoot = "${src.name}/coolercontrol-liqctld";

  format = "pyproject";



  nativeBuildInputs = with python3.pkgs; [

    setuptools

  ];

  nativeBuildInputs = with python3.pkgs; [ setuptools ];



  propagatedBuildInputs = with python3.pkgs; [

    liquidctl
@@ -26,7 +24,7 @@ python3.pkgs.buildPythonApplication { 
  postInstall = ''

    install -Dm444 "${src}/packaging/systemd/coolercontrol-liqctld.service" -t "$out/lib/systemd/system"

    substituteInPlace "$out/lib/systemd/system/coolercontrol-liqctld.service" \

      --replace '/usr/bin' "$out/bin"

      --replace-fail '/usr/bin' "$out/bin"

  '';



  meta = meta // {

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

+14 −6
Original line number Diff line number Diff line 
{ buildNpmPackage

}:

{ buildNpmPackage, autoPatchelfHook }:



{ version

, src

, meta

{

  version,

  src,

  meta,

}:



buildNpmPackage {
@@ -11,7 +11,15 @@ buildNpmPackage { 
  inherit version src;

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



  npmDepsHash = "sha256-PpX9lk+yEG1auvBv5JBdMh7rjWoM0oTYJx6Nme5ij8s=";

  npmDepsHash = "sha256-j+bGOGIG9H/1z0dN8BfvWSi6gPvYmCV7l0ZNH8h3yeU=";



  preBuild = ''

    autoPatchelf node_modules/sass-embedded-linux-x64/dart-sass/src/dart

  '';



  nativeBuildInputs = [ autoPatchelfHook ];



  dontAutoPatchelf = true;



  postBuild = ''

    cp -r dist $out

pkgs/applications/system/coolercontrol/coolercontrold.nix

+15 −19
Original line number Diff line number Diff line 
{ rustPlatform

, testers

, libdrm

, coolercontrol

, runtimeShell

{

  rustPlatform,

  testers,

  libdrm,

  coolercontrol,

  runtimeShell,

}:



{ version

, src

, meta

{

  version,

  src,

  meta,

}:



rustPlatform.buildRustPackage {
@@ -15,22 +17,16 @@ rustPlatform.buildRustPackage { 
  inherit version src;

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



  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

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

    };

  };

  useFetchCargoVendor = true;

  cargoHash = "sha256-ZAjaegUgNkKygXqskyeUkWpcqi1Jt7pE8GtqWlaP6/I=";



  buildInputs = [

    libdrm

  ];

  buildInputs = [ libdrm ];



  postPatch = ''

    # copy the frontend static resources to a directory for embedding

    mkdir -p ui-build

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

    substituteInPlace build.rs --replace '"./resources/app"' '"./ui-build"'

    substituteInPlace build.rs --replace-fail '"./resources/app"' '"./ui-build"'



    # Hardcode a shell

    substituteInPlace src/repositories/utils.rs \
@@ -40,7 +36,7 @@ rustPlatform.buildRustPackage { 
  postInstall = ''

    install -Dm444 "${src}/packaging/systemd/coolercontrold.service" -t "$out/lib/systemd/system"

    substituteInPlace "$out/lib/systemd/system/coolercontrold.service" \

      --replace '/usr/bin' "$out/bin"

      --replace-fail '/usr/bin' "$out/bin"

  '';



  passthru.tests.version = testers.testVersion {