From b2788a6f36baccc5d25f2f74a44799f72b7cad00 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Aug 2023 12:12:12 +0000 Subject: [PATCH 1/2] ddccontrol: 0.6.1 -> 0.6.2 --- pkgs/tools/misc/ddccontrol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 0f45361e3db6..51dea8523bb0 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol"; rev = version; - sha256 = "sha256-En2e0FDKLpMjuxa2aXuvI6h7d+D1D5x1dDg96924/qM="; + sha256 = "sha256-Me7E5dUo3tnuXInWF19AmrcyKMtBlugVmvQHULMMMoA="; }; nativeBuildInputs = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { substituteInPlace src/ddcpci/Makefile.am \ --replace "chmod 4711" "chmod 0711" - '' + lib.optionalString (lib.versionAtLeast "0.6.1" version) '' + '' + lib.optionalString (lib.versionAtLeast "0.6.2" version) '' # Upstream PR: https://github.com/ddccontrol/ddccontrol/pull/115 substituteInPlace src/lib/Makefile.am \ --replace "/etc/" "\$""{sysconfdir}/" From e047467f44ce5e1d70044ef84435e845bb115bac Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 29 Aug 2023 23:50:39 +0200 Subject: [PATCH 2/2] ddccontrol: cleanup --- pkgs/tools/misc/ddccontrol/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 51dea8523bb0..f920e3afc696 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -46,10 +46,6 @@ stdenv.mkDerivation rec { substituteInPlace src/ddcpci/Makefile.am \ --replace "chmod 4711" "chmod 0711" - '' + lib.optionalString (lib.versionAtLeast "0.6.2" version) '' - # Upstream PR: https://github.com/ddccontrol/ddccontrol/pull/115 - substituteInPlace src/lib/Makefile.am \ - --replace "/etc/" "\$""{sysconfdir}/" ''; preConfigure = ''