diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2019-01-25 22:57:53 -0500 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2019-01-25 22:57:53 -0500 |
| commit | 3da56c78446ac56939ff45c7a91ee7801a987ddd (patch) | |
| tree | a13518900a6ef84fbd17b9b70577ab2dbaa16609 /pkgs | |
| parent | 9e3db4df2c434ce5390c7dde47f2b606e724cbbd (diff) | |
| download | nixpkgs-3da56c78446ac56939ff45c7a91ee7801a987ddd.tar nixpkgs-3da56c78446ac56939ff45c7a91ee7801a987ddd.tar.gz nixpkgs-3da56c78446ac56939ff45c7a91ee7801a987ddd.tar.bz2 nixpkgs-3da56c78446ac56939ff45c7a91ee7801a987ddd.tar.lz nixpkgs-3da56c78446ac56939ff45c7a91ee7801a987ddd.tar.xz nixpkgs-3da56c78446ac56939ff45c7a91ee7801a987ddd.tar.zst nixpkgs-3da56c78446ac56939ff45c7a91ee7801a987ddd.zip | |
conky: 1.11.1 -> 1.11.2
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/conky/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 654e565140d..9519e72e91c 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.1"; + -> lua.luaversion == "5.3"; assert wirelessSupport -> wirelesstools != null; assert nvidiaSupport -> libXNVCtrl != null; @@ -66,13 +66,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "conky-${version}"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - sha256 = "00ghxzg78mp7w2y9cxhsdmkab2n7vfg76p6zihiglb2x3h2gjm5x"; + sha256 = "0yalcpwx85smh6nnvxxsgqi344nk7jzlkkam7yjghm87df4v7xmx"; }; postPatch = '' @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { # 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)" + substituteInPlace cmake/Conky.cmake --replace "# set(RELEASE true)" "set(RELEASE true)" ''; NIX_LDFLAGS = "-lgcc_s"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7990344674..8709e4d90f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14340,7 +14340,7 @@ in cockroachdb = callPackage ../servers/sql/cockroachdb { }; conky = callPackage ../os-specific/linux/conky ({ - lua = lua5_1; # conky can use 5.2, but toluapp can not + lua = lua5_3_compat; libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; pulseSupport = config.pulseaudio or false; } // config.conky or {}); |