diff options
| -rw-r--r-- | pkgs/applications/networking/newsreaders/liferea/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/i3/lock-fancy.nix | 33 | ||||
| -rw-r--r-- | pkgs/development/tools/toluapp/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/toluapp/headers.patch | 15 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/conky/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
6 files changed, 42 insertions, 28 deletions
diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 7f7b03f71d2d..0cfcf6408ba9 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -4,15 +4,13 @@ , gobject-introspection, glib-networking, hicolor-icon-theme }: -let +stdenv.mkDerivation rec { pname = "liferea"; - version = "1.12.4"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "1.12.6"; src = fetchurl { - url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "12852qp174nsg770cry7y257vfzl53hpy46h5agaimrfsc41mgln"; + url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}b.tar.bz2"; + sha256 = "sha256:03pr1gmiv5y0i92bkhcxr8s311ll91chz19wb96jkixx32xav91d"; }; nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index e28a9cf75be8..a0e46c108b7d 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -3,31 +3,32 @@ }: stdenv.mkDerivation rec { - rev = "3734fba160166006521e513f5734eb76ac6aa48f"; - name = "i3lock-fancy-unstable-2017-12-14_rev${builtins.substring 0 7 rev}"; + rev = "7accfb2aa2f918d1a3ab975b860df1693d20a81a"; + name = "i3lock-fancy-unstable-2018-11-25_rev${builtins.substring 0 7 rev}"; src = fetchFromGitHub { owner = "meskarune"; repo = "i3lock-fancy"; inherit rev; - sha256 = "1bg4xds2hmbq8rp6azbdqvgp1aaq5y1bp05cfwqqm6y3sjw7ywzl"; + sha256 = "00lqsvz1knb8iqy8lnkn3sf4c2c4nzb0smky63qf48m8za5aw9b1"; }; patchPhase = '' - sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" lock - sed -i -e "s|'rm -f |'${coreutils}/bin/rm -f |" lock - sed -i -e "s|scrot -z |${scrot}/bin/scrot -z |" lock - sed -i -e "s|convert |${imagemagick.out}/bin/convert |" lock - sed -i -e "s|awk -F|${gawk}/bin/awk -F|" lock - sed -i -e "s| awk | ${gawk}/bin/awk |" lock - sed -i -e "s|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" lock - sed -i -e 's|icon="$scriptpath/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' lock - sed -i -e 's|icon="$scriptpath/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' lock - sed -i -e "s|getopt |${getopt}/bin/getopt |" lock - sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" lock - sed -i -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z)|" lock + sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" i3lock-fancy + sed -i -e "s|'rm -f |'${coreutils}/bin/rm -f |" i3lock-fancy + sed -i -e "s|scrot -z |${scrot}/bin/scrot -z |" i3lock-fancy + sed -i -e "s|convert |${imagemagick.out}/bin/convert |" i3lock-fancy + sed -i -e "s|awk -F|${gawk}/bin/awk -F|" i3lock-fancy + sed -i -e "s| awk | ${gawk}/bin/awk |" i3lock-fancy + sed -i -e "s|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" i3lock-fancy + sed -i -e 's|icon="/usr/share/i3lock-fancy/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' i3lock-fancy + sed -i -e 's|icon="/usr/share/i3lock-fancy/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' i3lock-fancy + sed -i -e "s|getopt |${getopt}/bin/getopt |" i3lock-fancy + sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" i3lock-fancy + sed -i -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z)|" i3lock-fancy + rm Makefile ''; installPhase = '' mkdir -p $out/bin $out/share/i3lock-fancy/icons - cp lock $out/bin/i3lock-fancy + cp i3lock-fancy $out/bin/i3lock-fancy cp icons/lock*.png $out/share/i3lock-fancy/icons ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix index 5ad9a7c58efb..90d36c71caa9 100644 --- a/pkgs/development/tools/toluapp/default.nix +++ b/pkgs/development/tools/toluapp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ sconsPackages.scons_3_0_1 ]; buildInputs = [ lua ]; - patches = [ ./environ-and-linux-is-kinda-posix.patch ]; + patches = [ ./environ-and-linux-is-kinda-posix.patch ./headers.patch ]; preConfigure = '' substituteInPlace config_posix.py \ diff --git a/pkgs/development/tools/toluapp/headers.patch b/pkgs/development/tools/toluapp/headers.patch new file mode 100644 index 000000000000..59a47bb989a9 --- /dev/null +++ b/pkgs/development/tools/toluapp/headers.patch @@ -0,0 +1,15 @@ +diff --git a/include/tolua++.h b/include/tolua++.h +index ed53449..f57d56d 100644 +--- a/include/tolua++.h ++++ b/include/tolua++.h +@@ -43,8 +43,8 @@ extern "C" { + + typedef int lua_Object; + +-#include "lua.h" +-#include "lauxlib.h" ++#include <lua.h> ++#include <lauxlib.h> + + struct tolua_Error + { diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 654e565140d1..9519e72e91cb 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 e79903446740..8709e4d90f24 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 {}); |