From 8f6d3a3c33002e65a77939f1cad2b794ed6be6e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 29 Aug 2018 10:12:56 +0100 Subject: [PATCH] awesome-3-5: remove deprecated version (#45736) this version is deprecated and no longer maintained by upstream: https://awesomewm.org/download/ Two years should have been enough for people to upgrade. --- .../window-managers/awesome/3.5.nix | 86 ------------------- pkgs/top-level/all-packages.nix | 4 - 2 files changed, 90 deletions(-) delete mode 100644 pkgs/applications/window-managers/awesome/3.5.nix diff --git a/pkgs/applications/window-managers/awesome/3.5.nix b/pkgs/applications/window-managers/awesome/3.5.nix deleted file mode 100644 index f3d43d15efba..000000000000 --- a/pkgs/applications/window-managers/awesome/3.5.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 798521ac6f26..95fa7095cba9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15458,10 +15458,6 @@ with pkgs; ffmpeg = ffmpeg_2; }; - awesome-3-5 = callPackage ../applications/window-managers/awesome/3.5.nix { - cairo = cairo.override { xcbSupport = true; }; - luaPackages = luaPackages.override { inherit lua; }; - }; awesome-4-0 = callPackage ../applications/window-managers/awesome { cairo = cairo.override { xcbSupport = true; }; luaPackages = luaPackages.override { inherit lua; };