git.iko.soy/typeable/nixpkgs
on master help sign in
conky: 1.11.1 -> 1.11.2
commit3da56c78446ac56939ff45c7a91ee7801a987ddd authorTim Steinbach <tim@nequissimus.com> dateFri 25 Jan 2019, 22:57 (8 years ago) parent9e3db4d
2 files changed+5−5
pkgs/os-specific/linux/conky/default.nix+4−4 pkgs/top-level/all-packages.nix+1−1
pkgs/os-specific/linux/conky/default.nix+4−4
@@ -51,7 +51,7 @@ assert luaImlib2Support -> luaSupport && imlib2Support
5151assert luaCairoSupport -> luaSupport && toluapp != null
5252 && cairo != null;
5353assert luaCairoSupport || luaImlib2Support
54− -> lua.luaversion == "5.1";
54+ -> lua.luaversion == "5.3";
5555
5656assert wirelessSupport -> wirelesstools != null;
5757assert nvidiaSupport -> libXNVCtrl != null;
@@ -66,13 +66,13 @@ with stdenv.lib;
6666
6767stdenv.mkDerivation rec {
6868 name = "conky-${version}";
69− version = "1.11.1";
69+ version = "1.11.2";
7070
7171 src = fetchFromGitHub {
7272 owner = "brndnmtthws";
7373 repo = "conky";
7474 rev = "v${version}";
75− sha256 = "00ghxzg78mp7w2y9cxhsdmkab2n7vfg76p6zihiglb2x3h2gjm5x";
75+ sha256 = "0yalcpwx85smh6nnvxxsgqi344nk7jzlkkam7yjghm87df4v7xmx";
7676 };
7777
7878 postPatch = ''
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
8282 # Drop examples, since they contain non-ASCII characters that break docbook2x :(
8383 sed -i 's/ Example: .*$//' doc/config_settings.xml
8484
85− substituteInPlace cmake/Conky.cmake --replace "#set(RELEASE true)" "set(RELEASE true)"
85+ substituteInPlace cmake/Conky.cmake --replace "# set(RELEASE true)" "set(RELEASE true)"
8686 '';
8787
8888 NIX_LDFLAGS = "-lgcc_s";
pkgs/top-level/all-packages.nix+1−1
@@ -14340,7 +14340,7 @@ in
1434014340 cockroachdb = callPackage ../servers/sql/cockroachdb { };
1434114341
1434214342 conky = callPackage ../os-specific/linux/conky ({
14343− lua = lua5_1; # conky can use 5.2, but toluapp can not
14343+ lua = lua5_3_compat;
1434414344 libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
1434514345 pulseSupport = config.pulseaudio or false;
1434614346 } // config.conky or {});