From 1ed537a2a375b1df7b9448e90f85047806573c78 Mon Sep 17 00:00:00 2001 From: tranquillity-codes Date: Sun, 19 Feb 2023 21:38:00 +0100 Subject: [PATCH 1/3] conky: 1.13.1 -> 1.18.0 --- pkgs/os-specific/linux/conky/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index a5fbc2817db09..4fdef260e2129 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -67,22 +67,25 @@ with lib; stdenv.mkDerivation rec { pname = "conky"; - version = "1.13.1"; + version = "1.18.0"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - sha256 = "sha256-3eCRzjfHGFiKuxmRHvnzqAg/+ApUKnHhsumWnio/Qxg="; + sha256 = "sha256-a0RGgX325NztDcQwg9+ibxOstU0MSS3eSTaljgt9qPQ="; }; + # For some reason -Werror is on by default, causing the project to fail compilation. + buildPhase = '' + make + ''; + NIX_CFLAGS_COMPILE = "-Wno-error"; + postPatch = '' sed -i -e '/include.*CheckIncludeFile)/i include(CheckIncludeFiles)' \ cmake/ConkyPlatformChecks.cmake '' + optionalString docsSupport '' - # Drop examples, since they contain non-ASCII characters that break docbook2x :( - sed -i 's/ Example: .*$//' doc/config_settings.xml - substituteInPlace cmake/Conky.cmake --replace "# set(RELEASE true)" "set(RELEASE true)" cp ${catch2}/include/catch2/catch.hpp tests/catch2/catch.hpp From c6e61dd5df82e24bd8d1eed59dc450add8f8c6ab Mon Sep 17 00:00:00 2001 From: tranquillity-codes Date: Sun, 28 May 2023 04:14:08 +0200 Subject: [PATCH 2/3] conky: lua 5.3 -> lua 5.4 --- pkgs/os-specific/linux/conky/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 4fdef260e2129..a9ac58d13e3de 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -51,7 +51,7 @@ assert luaImlib2Support -> luaSupport && imlib2Support assert luaCairoSupport -> luaSupport && toluapp != null && cairo != null; assert luaCairoSupport || luaImlib2Support - -> lua.luaversion == "5.3"; + -> lua.luaversion == "5.4"; assert wirelessSupport -> wirelesstools != null; assert nvidiaSupport -> libXNVCtrl != null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a346ba031f3f..121ffaa41062a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25698,7 +25698,7 @@ with pkgs; cockroachdb = callPackage ../servers/sql/cockroachdb { }; conky = callPackage ../os-specific/linux/conky ({ - lua = lua5_3_compat; + lua = lua5_4; inherit (linuxPackages.nvidia_x11.settings) libXNVCtrl; } // config.conky or {}); From eb258290305a64a5f6534cf26268eadd0877083f Mon Sep 17 00:00:00 2001 From: tranquillity-codes Date: Wed, 31 May 2023 00:57:33 +0200 Subject: [PATCH 3/3] conky: clean up compiler flags --- pkgs/os-specific/linux/conky/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index a9ac58d13e3de..68b174dba5b3e 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -76,11 +76,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-a0RGgX325NztDcQwg9+ibxOstU0MSS3eSTaljgt9qPQ="; }; - # For some reason -Werror is on by default, causing the project to fail compilation. - buildPhase = '' - make - ''; - NIX_CFLAGS_COMPILE = "-Wno-error"; postPatch = '' sed -i -e '/include.*CheckIncludeFile)/i include(CheckIncludeFiles)' \ @@ -91,7 +86,11 @@ stdenv.mkDerivation rec { cp ${catch2}/include/catch2/catch.hpp tests/catch2/catch.hpp ''; - NIX_LDFLAGS = "-lgcc_s"; + env = { + # For some reason -Werror is on by default, causing the project to fail compilation. + NIX_CFLAGS_COMPILE = "-Wno-error"; + NIX_LDFLAGS = "-lgcc_s"; + }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glib libXinerama ]