From b33907075f1b8f8b9abc8e7c8bbb3fd20ff81d62 Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Mon, 26 Dec 2016 21:33:19 +0200 Subject: [PATCH 1/2] awesome: 3.5.9 -> 4.0 --- .../window-managers/awesome/3.4.nix | 55 ------------ .../window-managers/awesome/3.5.nix | 86 +++++++++++++++++++ .../window-managers/awesome/default.nix | 13 +-- pkgs/top-level/all-packages.nix | 12 +-- 4 files changed, 100 insertions(+), 66 deletions(-) delete mode 100644 pkgs/applications/window-managers/awesome/3.4.nix create mode 100644 pkgs/applications/window-managers/awesome/3.5.nix diff --git a/pkgs/applications/window-managers/awesome/3.4.nix b/pkgs/applications/window-managers/awesome/3.4.nix deleted file mode 100644 index 961296c6eecf..000000000000 --- a/pkgs/applications/window-managers/awesome/3.4.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, fetchurl, cmake, gperf, imagemagick, pkgconfig, lua -, glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil -, xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau -, libXdmcp, pixman, doxygen -, libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl -, docbook_xml_dtd_45, libxslt, coreutils, which }: - -let - version = "3.4.13"; -in - -stdenv.mkDerivation rec { - name = "awesome-${version}"; - - src = fetchurl { - url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; - sha256 = "0jhsgb8wdzpfmdyl9fxp2w6app7l6zl8b513z3ff513nvdlxj5hr"; - }; - - buildInputs = [ cmake gperf imagemagick pkgconfig lua glib cairo pango - imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm - libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen - asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt which ]; - - # We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in - # the awesome lua code. I prefered that instead of adding 'bash' or 'zsh' as - # dependencies. - prePatch = '' - # Fix the tab completion (supporting bash or zsh) - sed s,/usr/bin/env,${coreutils}/bin/env, -i lib/awful/completion.lua.in - # Remove the 'root' PATH override (I don't know why they have that) - sed /WHOAMI/d -i utils/awsetbg - # Russian manpages fail to be generated: - # [ 56%] Generating manpages/ru/man1/awesome.1.xml - # asciidoc: ERROR: : line 3: name section expected - # asciidoc: FAILED: : line 3: section title expected - # make[2]: *** [manpages/ru/man1/awesome.1.xml] Error 1 - substituteInPlace CMakeLists.txt \ - --replace "set(AWE_MAN_LANGS it es fr de ru)" \ - "set(AWE_MAN_LANGS it es fr de)" - ''; - - meta = { - homepage = http://awesome.naquadah.org/; - description = "Highly configurable, dynamic window manager for X"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; - - passthru = { - inherit lua; - }; - -} diff --git a/pkgs/applications/window-managers/awesome/3.5.nix b/pkgs/applications/window-managers/awesome/3.5.nix new file mode 100644 index 000000000000..3a2a030b8a4d --- /dev/null +++ b/pkgs/applications/window-managers/awesome/3.5.nix @@ -0,0 +1,86 @@ +{ stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf +, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs +, xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter +, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm +, which, dbus, nettools, git, asciidoc, doxygen +, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs +}: + +let + version = "3.5.9"; +in with luaPackages; + +stdenv.mkDerivation rec { + name = "awesome-${version}"; + + src = fetchurl { + url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; + sha256 = "0kynair1ykr74b39a4gcm2y24viial64337cf26nhlc7azjbby67"; + }; + + meta = with stdenv.lib; { + description = "Highly configurable, dynamic window manager for X"; + homepage = http://awesome.naquadah.org/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.linux; + }; + + nativeBuildInputs = [ + asciidoc + cmake + doxygen + imagemagick + makeWrapper + pkgconfig + xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs + ]; + + buildInputs = [ + cairo + dbus + gdk_pixbuf + gobjectIntrospection + git + lgi + libpthreadstubs + libstartup_notification + libxdg_basedir + lua + nettools + pango + xcb-util-cursor + xorg.libXau + xorg.libXdmcp + xorg.libxcb + xorg.libxshmfence + xorg.xcbutil + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xorg.xcbutilwm + ]; + + #cmakeFlags = "-DGENERATE_MANPAGES=ON"; + + LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}"; + GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0"; + LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so"; + LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"; + + postInstall = '' + wrapProgram $out/bin/awesome \ + --prefix LUA_CPATH ";" '"${lgi}/lib/lua/${lua.luaversion}/?.so"' \ + --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}" + + wrapProgram $out/bin/awesome-client \ + --prefix PATH : "${which}/bin" + ''; + + passthru = { + inherit lua; + }; +} diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 3a2a030b8a4d..9fa4d6a6d8ef 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -4,25 +4,26 @@ , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm , which, dbus, nettools, git, asciidoc, doxygen , xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs +, libxkbcommon, xcbutilxrm }: let - version = "3.5.9"; + version = "4.0"; in with luaPackages; stdenv.mkDerivation rec { name = "awesome-${version}"; src = fetchurl { - url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; - sha256 = "0kynair1ykr74b39a4gcm2y24viial64337cf26nhlc7azjbby67"; + url = "http://github.com/awesomeWM/awesome-releases/raw/master/${name}.tar.xz"; + sha256 = "0czkcz67sab63gf5m2p2pgg05yinjx60hfb9rfyzdkkg28q9f02w"; }; meta = with stdenv.lib; { description = "Highly configurable, dynamic window manager for X"; - homepage = http://awesome.naquadah.org/; + homepage = https://awesomewm.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 ]; + maintainers = with maintainers; [ lovek323 rasendubi ]; platforms = platforms.linux; }; @@ -59,6 +60,8 @@ stdenv.mkDerivation rec { xorg.xcbutilkeysyms xorg.xcbutilrenderutil xorg.xcbutilwm + libxkbcommon + xcbutilxrm ]; #cmakeFlags = "-DGENERATE_MANPAGES=ON"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95b8baf7be29..3de4fcb56690 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12328,15 +12328,15 @@ in ffmpeg = ffmpeg_2; }; - awesome-3-4 = callPackage ../applications/window-managers/awesome/3.4.nix { - cairo = cairo.override { xcbSupport = true; }; - lua = lua5_1; - }; - awesome-3-5 = callPackage ../applications/window-managers/awesome { + awesome-3-5 = callPackage ../applications/window-managers/awesome/3.5.nix { cairo = cairo.override { xcbSupport = true; }; luaPackages = luaPackages.override { inherit lua; }; }; - awesome = awesome-3-5; + awesome-4-0 = callPackage ../applications/window-managers/awesome { + cairo = cairo.override { xcbSupport = true; }; + luaPackages = luaPackages.override { inherit lua; }; + }; + awesome = awesome-4-0; awesomebump = qt5.callPackage ../applications/graphics/awesomebump { }; From f969f42b2b1103a57cb856a8125a77d0a50baa40 Mon Sep 17 00:00:00 2001 From: Milan Svoboda Date: Wed, 28 Dec 2016 23:47:39 +0100 Subject: [PATCH 2/2] ranger 1.7.2 -> 1.8.0 (#21480) --- pkgs/applications/misc/ranger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 048a7877362b..673e4b020852 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages, w3m, file, less }: pythonPackages.buildPythonApplication rec { - name = "ranger-1.7.2"; + name = "ranger-1.8.0"; meta = { description = "File manager with minimalistic curses interface"; @@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec { src = fetchurl { url = "http://ranger.nongnu.org/${name}.tar.gz"; - sha256 = "0yaviybviwdvfg2a0pf2kk28g10k245499xmbpqlai7fv91f7xll"; + sha256 = "14j067n1azk6vc6cxlhi5w5bsn2wcz4hypvgxc0vjl9xp5n4f0nf"; }; propagatedBuildInputs = [ file ];