dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Cosima Neidahl 2024-11-28 00:19:26 +01:00 committed by GitHub
commit 013f23de04
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 67 additions and 3607 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3548
pkgs/applications/system/coolercontrol/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

36
pkgs/applications/system/coolercontrol/coolercontrol-gui.nix
View File

@ -1,20 +1,22 @@
{ lib {
, rustPlatform lib,
, dbus rustPlatform,
, freetype dbus,
, gtk3 freetype,
, libsoup_3 gtk3,
, openssl libsoup_3,
, pkg-config openssl,
, webkitgtk_4_1 pkg-config,
, libappindicator webkitgtk_4_1,
, makeWrapper libappindicator,
, coolercontrol makeWrapper,
coolercontrol,
}: }:
{ version {
, src version,
, meta src,
meta,
}: }:
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
@ -22,7 +24,7 @@ rustPlatform.buildRustPackage {
inherit version src; inherit version src;
sourceRoot = "${src.name}/coolercontrol-ui/src-tauri"; sourceRoot = "${src.name}/coolercontrol-ui/src-tauri";
cargoHash = "sha256-0Ud5S4T5+5eBuvD5N64NAvbK0+tTozKsPhsNziCEu3I="; cargoHash = "sha256-nS67ABuI2/C08X+TWWoOx7bptIPF1fsvBC1Ucoky1/4=";
buildFeatures = [ "custom-protocol" ]; buildFeatures = [ "custom-protocol" ];
@ -48,7 +50,7 @@ rustPlatform.buildRustPackage {
postPatch = '' postPatch = ''
mkdir -p ui-build mkdir -p ui-build
cp -R ${coolercontrol.coolercontrol-ui-data}/* 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 = '' postInstall = ''

16
pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix
View File

@ -1,9 +1,9 @@
{ python3 { python3 }:
}:
{ version {
, src version,
, meta src,
meta,
}: }:
python3.pkgs.buildPythonApplication { python3.pkgs.buildPythonApplication {
@ -12,9 +12,7 @@ python3.pkgs.buildPythonApplication {
sourceRoot = "${src.name}/coolercontrol-liqctld"; sourceRoot = "${src.name}/coolercontrol-liqctld";
format = "pyproject"; format = "pyproject";
nativeBuildInputs = with python3.pkgs; [ nativeBuildInputs = with python3.pkgs; [ setuptools ];
setuptools
];
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
liquidctl liquidctl
@ -26,7 +24,7 @@ python3.pkgs.buildPythonApplication {
postInstall = '' postInstall = ''
install -Dm444 "${src}/packaging/systemd/coolercontrol-liqctld.service" -t "$out/lib/systemd/system" install -Dm444 "${src}/packaging/systemd/coolercontrol-liqctld.service" -t "$out/lib/systemd/system"
substituteInPlace "$out/lib/systemd/system/coolercontrol-liqctld.service" \ substituteInPlace "$out/lib/systemd/system/coolercontrol-liqctld.service" \
--replace '/usr/bin' "$out/bin" --replace-fail '/usr/bin' "$out/bin"
''; '';
meta = meta // { meta = meta // {

20
pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix
View File

@ -1,9 +1,9 @@
{ buildNpmPackage { buildNpmPackage, autoPatchelfHook }:
}:
{ version {
, src version,
, meta src,
meta,
}: }:
buildNpmPackage { buildNpmPackage {
@ -11,7 +11,15 @@ buildNpmPackage {
inherit version src; inherit version src;
sourceRoot = "${src.name}/coolercontrol-ui"; 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 = '' postBuild = ''
cp -r dist $out cp -r dist $out

34
pkgs/applications/system/coolercontrol/coolercontrold.nix
View File

@ -1,13 +1,15 @@
{ rustPlatform {
, testers rustPlatform,
, libdrm testers,
, coolercontrol libdrm,
, runtimeShell coolercontrol,
runtimeShell,
}: }:
{ version {
, src version,
, meta src,
meta,
}: }:
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
@ -15,22 +17,16 @@ rustPlatform.buildRustPackage {
inherit version src; inherit version src;
sourceRoot = "${src.name}/coolercontrold"; sourceRoot = "${src.name}/coolercontrold";
cargoLock = { useFetchCargoVendor = true;
lockFile = ./Cargo.lock; cargoHash = "sha256-ZAjaegUgNkKygXqskyeUkWpcqi1Jt7pE8GtqWlaP6/I=";
outputHashes = {
"nvml-wrapper-0.10.0" = "sha256-pMiULWT+nJXcDfLDeACG/DaPF5+AbzpoIUWWWz8mQ+0=";
};
};
buildInputs = [ buildInputs = [ libdrm ];
libdrm
];
postPatch = '' postPatch = ''
# copy the frontend static resources to a directory for embedding # copy the frontend static resources to a directory for embedding
mkdir -p ui-build mkdir -p ui-build
cp -R ${coolercontrol.coolercontrol-ui-data}/* 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 # Hardcode a shell
substituteInPlace src/repositories/utils.rs \ substituteInPlace src/repositories/utils.rs \
@ -40,7 +36,7 @@ rustPlatform.buildRustPackage {
postInstall = '' postInstall = ''
install -Dm444 "${src}/packaging/systemd/coolercontrold.service" -t "$out/lib/systemd/system" install -Dm444 "${src}/packaging/systemd/coolercontrold.service" -t "$out/lib/systemd/system"
substituteInPlace "$out/lib/systemd/system/coolercontrold.service" \ substituteInPlace "$out/lib/systemd/system/coolercontrold.service" \
--replace '/usr/bin' "$out/bin" --replace-fail '/usr/bin' "$out/bin"
''; '';
passthru.tests.version = testers.testVersion { passthru.tests.version = testers.testVersion {

20
pkgs/applications/system/coolercontrol/default.nix
View File

@ -1,24 +1,28 @@
{ lib {
, fetchFromGitLab lib,
, callPackage fetchFromGitLab,
callPackage,
}: }:
let let
version = "1.4.0"; version = "1.4.4";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "coolercontrol"; owner = "coolercontrol";
repo = "coolercontrol"; repo = "coolercontrol";
rev = version; rev = version;
hash = "sha256-jsgso9MHt5Szzp9YkuXz8qysdN0li/zD2R/vSZ2Lw5M="; hash = "sha256-9l10X4uDv3KJz582QQMhqh38bwDtQVHm9HdAVNC6Kfg=";
}; };
meta = with lib; { meta = {
description = "Monitor and control your cooling devices"; description = "Monitor and control your cooling devices";
homepage = "https://gitlab.com/coolercontrol/coolercontrol"; homepage = "https://gitlab.com/coolercontrol/coolercontrol";
license = licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ codifryed OPNA2608 ]; maintainers = with lib.maintainers; [
codifryed
OPNA2608
];
}; };
applySharedDetails = drv: drv { inherit version src meta; }; applySharedDetails = drv: drv { inherit version src meta; };