Merge master into staging-next

9 files changed, 0 insertions, 556 deletions

diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix
deleted file mode 100644
index e344bbdf558..00000000000
--- a/pkgs/applications/window-managers/afterstep/default.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config
-, libtiff
-, fltk, gtk
-, libICE, libSM
-, dbus
-, fetchpatch
-}:
-
-stdenv.mkDerivation rec {
-
-  pname = "afterstep";
-  version = "2.2.12";
-  sourceName = "AfterStep-${version}";
-
-  src = fetchurl {
-    urls = [ "ftp://ftp.afterstep.org/stable/${sourceName}.tar.bz2" ];
-    sha256 = "1j7vkx1ig4kzwffdxnkqv3kld9qi3sam4w2nhq18waqjsi8xl5gz";
-  };
-
-  patches = [
-    (fetchpatch {
-      url = "https://salsa.debian.org/debian/afterstep/raw/master/debian/patches/44-Fix-build-with-gcc-5.patch";
-      sha256 = "1vipy2lzzd2gqrsqk85pwgcdhargy815fxlbn57hsm45zglc3lj4";
-    })
-
-    # Fix pending upstream inclusion for binutils-2.36 support:
-    #  https://github.com/afterstep/afterstep/pull/7
-    (fetchpatch {
-      name = "binutils-2.36.patch";
-      url = "https://github.com/afterstep/afterstep/commit/5e9e897cf8c455390dd6f5b27fec49707f6b9088.patch";
-      sha256 = "1kk97max05r2p1a71pvpaza79ff0klz32rggik342p7ki3516qv8";
-    })
-  ];
-
-  postPatch = ''
-    # Causes fatal ldconfig cache generation attempt on non-NixOS Linux
-    for mkfile in autoconf/Makefile.common.lib.in libAfter{Base,Image}/Makefile.in; do
-      substituteInPlace $mkfile \
-        --replace 'test -w /etc' 'false'
-    done
-  '';
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libtiff fltk gtk libICE libSM dbus ];
-
-  # A strange type of bug: dbus is not immediately found by pkg-config
-  preConfigure = ''
-    # binutils 2.37 fix
-    # https://github.com/afterstep/afterstep/issues/2
-    fixupList=(
-      "autoconf/Makefile.defines.in"
-      "libAfterImage/aftershow/Makefile.in"
-      "libAfterImage/apps/Makefile.in"
-      "libAfterBase/Makefile.in"
-      "libAfterImage/Makefile.in"
-    )
-    for toFix in "''${fixupList[@]}"; do
-      substituteInPlace "$toFix" --replace "clq" "cq"
-    done
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config dbus-1 --cflags)"
-  '';
-
-  # Parallel build fails due to missing dependencies between private libraries:
-  #   ld: cannot find ../libAfterConf/libAfterConf.a: No such file or directory
-  # Let's disable parallel builds until it's fixed upstream:
-  #   https://github.com/afterstep/afterstep/issues/8
-  enableParallelBuilding = false;
-
-  meta = with lib; {
-    description = "A NEXTStep-inspired window manager";
-    longDescription = ''
-      AfterStep is a window manager for the Unix X Window
-      System. Originally based on the look and feel of the NeXTStep
-      interface, it provides end users with a consistent, clean, and
-      elegant desktop. The goal of AfterStep development is to provide
-      for flexibility of desktop configuration, improving aestetics,
-      and efficient use of system resources.
-    '';
-    homepage = "http://www.afterstep.org/";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.AndersonTorres ];
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/applications/window-managers/berry/default.nix b/pkgs/applications/window-managers/berry/default.nix
deleted file mode 100644
index e044ce8485e..00000000000
--- a/pkgs/applications/window-managers/berry/default.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, copyDesktopItems
-, fontconfig
-, freetype
-, libX11
-, libXext
-, libXft
-, libXinerama
-, makeDesktopItem
-, pkg-config
-, which
-}:
-
-stdenv.mkDerivation rec {
-  pname = "berry";
-  version = "0.1.12";
-
-  src = fetchFromGitHub {
-    owner = "JLErvin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-xMJRiLNtwVRQf9HiCF3ClLKEmdDNxcY35IYxe+L7+Hk=";
-  };
-
-  nativeBuildInputs = [
-    copyDesktopItems
-    pkg-config
-    which
-  ];
-
-  buildInputs =[
-    libX11
-    libXext
-    libXft
-    libXinerama
-    fontconfig
-    freetype
-  ];
-
-  postPatch = ''
-    sed -i --regexp-extended 's/(pkg_verstr=").*(")/\1${version}\2/' configure
-  '';
-
-  preConfigure = ''
-    patchShebangs configure
-  '';
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = pname;
-      exec = "berry";
-      comment = meta.description;
-      desktopName = "Berry Window Manager";
-      genericName = "Berry Window Manager";
-      categories = [ "Utility" ];
-    })
-  ];
-
-  meta = with lib; {
-    homepage = "https://berrywm.org/";
-    description = "A healthy, bite-sized window manager";
-    longDescription = ''
-      berry is a healthy, bite-sized window manager written in C for unix
-      systems. Its main features include:
-
-      - Controlled via a powerful command-line client, allowing users to control
-        windows via a hotkey daemon such as sxhkd or expand functionality via
-        shell scripts.
-      - Small, hackable source code.
-      - Extensible themeing options with double borders, title bars, and window
-        text.
-      - Intuitively place new windows in unoccupied spaces.
-      - Virtual desktops.
-    '';
-    license = licenses.mit;
-    maintainers = [ maintainers.AndersonTorres ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix
deleted file mode 100644
index d4ae41134eb..00000000000
--- a/pkgs/applications/window-managers/notion/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config
-, lua, gettext, which, groff, xmessage, xterm
-, readline, fontconfig, libX11, libXext, libSM
-, libXinerama, libXrandr, libXft
-, makeWrapper
-}:
-
-stdenv.mkDerivation rec {
-  pname = "notion";
-  version = "4.0.2";
-
-  src = fetchFromGitHub {
-    owner = "raboof";
-    repo = pname;
-    rev = version;
-    sha256 = "14swd0yqci8lxn259fkd9w92bgyf4rmjwgvgyqp78wlfix6ai4mv";
-  };
-
-  # error: 'PATH_MAX' undeclared
-  postPatch = ''
-    sed 1i'#include <linux/limits.h>' -i mod_notionflux/notionflux/notionflux.c
-  '';
-
-  nativeBuildInputs = [ pkg-config makeWrapper groff ];
-  buildInputs = [ lua gettext which readline fontconfig libX11 libXext libSM
-                  libXinerama libXrandr libXft ];
-
-  buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" ];
-
-  makeFlags = [ "NOTION_RELEASE=${version}" "PREFIX=\${out}" ];
-
-  postInstall = ''
-    wrapProgram $out/bin/notion \
-      --prefix PATH ":" "${xmessage}/bin:${xterm}/bin" \
-  '';
-
-  meta = with lib; {
-    description = "Tiling tabbed window manager";
-    homepage = "https://notionwm.net";
-    license   = licenses.lgpl21;
-    maintainers = with maintainers; [ jfb AndersonTorres raboof ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix
deleted file mode 100644
index dcd2bb27a71..00000000000
--- a/pkgs/applications/window-managers/pekwm/default.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, awk
-, grep
-, sed
-, runtimeShell
-, cmake
-, libXext
-, libXft
-, libXinerama
-, libXpm
-, libXrandr
-, libjpeg
-, libpng
-, pkg-config
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "pekwm";
-  version = "0.3.0";
-
-  src = fetchFromGitHub {
-    owner = "pekdon";
-    repo = "pekwm";
-    rev = "release-${finalAttrs.version}";
-    hash= "sha256-hA+TBAs9NMcc5DKIkzyUHWck3Xht+yeCO54xJ6oXXuQ=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  cmakeFlags = [
-    "-DAWK=${awk}/bin/awk"
-    "-DGREP=${grep}/bin/grep"
-    "-DSED=${sed}/bin/sed"
-    "-DSH=${runtimeShell}"
-  ];
-
-  buildInputs = [
-    libXext
-    libXft
-    libXinerama
-    libXpm
-    libXrandr
-    libjpeg
-    libpng
-  ];
-
-  meta = {
-    homepage = "https://www.pekwm.se/";
-    description = "A lightweight window manager";
-    longDescription = ''
-      pekwm is a window manager that once upon a time was based on the aewm++
-      window manager, but it has evolved enough that it no longer resembles
-      aewm++ at all. It has a much expanded feature-set, including window
-      grouping (similar to ion, pwm, or fluxbox), autoproperties, xinerama,
-      keygrabber that supports keychains, and much more.
-
-      - Lightweight and Unobtrusive, a window manager shouldn't be noticed.
-      - Very configurable, we all work and think in different ways.
-      - Automatic properties, for all the lazy people, make things appear as
-        they should when starting applications.
-      - Chainable Keygrabber, usability for everyone.
-    '';
-    changelog = "https://raw.githubusercontent.com/pekwm/pekwm/release-${finalAttrs.version}/NEWS.md";
-    license = lib.licenses.gpl2Plus;
-    maintainers = [ lib.maintainers.AndersonTorres ];
-    platforms = lib.platforms.linux;
-  };
-})
diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix
deleted file mode 100644
index 472707bf35c..00000000000
--- a/pkgs/applications/window-managers/ratpoison/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, perl, autoconf, automake
-, libX11, xorgproto, libXt, libXpm, libXft, libXtst, libXi
-, libXrandr, fontconfig, freetype, readline
-}:
-
-stdenv.mkDerivation rec {
-  pname = "ratpoison";
-  version = "1.4.9";
-
-  src = fetchurl {
-    url = "mirror://savannah/ratpoison/${pname}-${version}.tar.xz";
-    sha256 = "1wfir1gvh5h7izgvx2kd1pr2k7wlncd33zq7qi9s9k2y0aza93yr";
-  };
-
-  outputs = [ "out" "contrib" "man" "doc" "info" ];
-
-  configureFlags = [
-    # >=1.4.9 requires this even with readline in inputs
-    "--enable-history"
-  ];
-
-  nativeBuildInputs = [ pkg-config autoconf automake ];
-
-  buildInputs =
-    [ perl
-      libX11 xorgproto libXt libXpm libXft libXtst libXi libXrandr
-      fontconfig freetype readline ];
-
-  postInstall = ''
-    mkdir -p $contrib/{bin,share}
-    mv $out/bin/rpws $contrib/bin
-    mv $out/share/ratpoison $contrib/share
-  '';
-
-  meta = with lib; {
-    homepage = "https://www.nongnu.org/ratpoison/";
-    description = "Simple mouse-free tiling window manager";
-    license = licenses.gpl2Plus;
-
-    longDescription = ''
-       Ratpoison is a simple window manager with no fat library
-       dependencies, no fancy graphics, no window decorations, and no
-       rodent dependence.  It is largely modelled after GNU Screen which
-       has done wonders in the virtual terminal market.
-
-       The screen can be split into non-overlapping frames.  All windows
-       are kept maximized inside their frames to take full advantage of
-       your precious screen real estate.
-
-       All interaction with the window manager is done through keystrokes.
-       Ratpoison has a prefix map to minimize the key clobbering that
-       cripples Emacs and other quality pieces of software.
-    '';
-
-    platforms = platforms.unix;
-    maintainers = [ maintainers.AndersonTorres ];
-  };
-}
diff --git a/pkgs/applications/window-managers/smallwm/default.nix b/pkgs/applications/window-managers/smallwm/default.nix
deleted file mode 100644
index 9dd2a25e5cf..00000000000
--- a/pkgs/applications/window-managers/smallwm/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib, stdenv, fetchFromGitHub
-, doxygen, graphviz, libX11, libXrandr }:
-
-stdenv.mkDerivation rec {
-
-  pname = "smallwm";
-  version = "2020-02-28";
-
-  src = fetchFromGitHub {
-    owner = "adamnew123456";
-    repo = "SmallWM";
-    rev = "c2dc72afa87241bcf7e646630f4aae216ce78613";
-    sha256 = "0cqhy81ymdcdyvgi55a401rr96h2akskcxi9ddzjbln4a71yjlz8";
-  };
-
-  nativeBuildInputs = [ doxygen graphviz ];
-  buildInputs = [ libX11 libXrandr ];
-
-  dontConfigure = true;
-
-  makeFlags = [ "CC=${stdenv.cc}/bin/cc" "CXX=${stdenv.cc}/bin/c++" ];
-
-  buildFlags = [ "all" "doc" ];
-
-  installPhase = ''
-    install -dm755 $out/bin $out/share/doc/${pname}-${version}
-    install -m755 bin/smallwm -t $out/bin
-    cp -r README.markdown doc/html doc/latex $out/share/doc/${pname}-${version}
-  '';
-
-  meta = with lib;{
-    description = "A small X window manager, extended from tinywm";
-    homepage = "https://github.com/adamnew123456/SmallWM";
-    license = licenses.bsd2;
-    maintainers = [ maintainers.AndersonTorres ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/window-managers/tinywm/default.nix b/pkgs/applications/window-managers/tinywm/default.nix
deleted file mode 100644
index 903502db501..00000000000
--- a/pkgs/applications/window-managers/tinywm/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ lib, stdenv, fetchFromGitHub
-, libX11 }:
-
-stdenv.mkDerivation rec {
-  pname = "tinywm";
-  version = "2014-04-22";
-
-  src = fetchFromGitHub {
-    owner = "mackstann";
-    repo = pname;
-    rev = "9d05612f41fdb8bc359f1fd9cc930bf16315abb1";
-    sha256 = "1s7r4f2d3lk1i8h089v2vyrr02hh0y9i3ihl9kqgk9s87hqw8q5b";
-  };
-
-  buildInputs = [ libX11 ];
-
-  dontConfigure = true;
-
-  buildPhase = ''
-    $CC -Wall -pedantic -I${libX11}/include tinywm.c -L${libX11}/lib -lX11 -o tinywm
-  '';
-
-  installPhase = ''
-    install -dm755 $out/bin $out/share/doc/${pname}-${version}
-    install -m755 tinywm -t $out/bin/
-    # The annotated source code is a piece of documentation
-    install -m644 annotated.c README -t $out/share/doc/${pname}-${version}
-  '';
-
-  meta = with lib;{
-    description = "A tiny window manager for X11";
-    longDescription = ''
-
-      TinyWM is a tiny window manager that I created as an exercise in
-      minimalism. It is also maybe helpful in learning some of the very basics
-      of creating a window manager. It is only around 50 lines of C. There is
-      also a Python version using python-xlib.
-
-      It lets you do four basic things:
-
-      - Move windows interactively with Alt+Button1 drag (left mouse button)
-      - Resize windows interactively with Alt+Button3 drag (right mouse button)
-      - Raise windows with Alt+F1 (not high on usability I know, but I needed a
-        keybinding in there somewhere)
-      - Focus windows with the mouse pointer (X does this on its own)
-    '';
-    homepage = "http://incise.org/tinywm.html";
-    maintainers = with maintainers; [ AndersonTorres ];
-    platforms = libX11.meta.platforms;
-    license = licenses.publicDomain;
-  };
-}
diff --git a/pkgs/applications/window-managers/waybox/default.nix b/pkgs/applications/window-managers/waybox/default.nix
deleted file mode 100644
index cf85b9ea06a..00000000000
--- a/pkgs/applications/window-managers/waybox/default.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, pkg-config
-, meson
-, cmake
-, ninja
-, libxkbcommon
-, wayland
-, wayland-scanner
-, wayland-protocols
-, wlroots
-, pixman
-, udev
-, libGL
-, libxml2
-, mesa
-}:
-
-stdenv.mkDerivation rec {
-  pname = "waybox";
-  version = "0.2.0";
-
-  src = fetchFromGitHub {
-    owner = "wizbright";
-    repo = pname;
-    rev = version;
-    hash = "sha256-G8dRa4hgev3x58uqp5To5OzF3zcPSuT3NL9MPnWf2M8=";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    meson
-    cmake
-    ninja
-    wayland-scanner
-  ];
-
-  dontUseCmakeConfigure = true;
-
-  buildInputs = [
-    libxkbcommon
-    libxml2
-    wayland
-    wayland-protocols
-    wlroots
-    pixman
-    udev
-    libGL
-    mesa # for libEGL
-  ];
-
-  passthru.providedSessions = [ "waybox" ];
-
-  meta = with lib; {
-    homepage = "https://github.com/wizbright/waybox";
-    description = "An openbox clone on Wayland";
-    license = licenses.mit;
-    maintainers = with maintainers; [ AndersonTorres ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/window-managers/yeahwm/default.nix b/pkgs/applications/window-managers/yeahwm/default.nix
deleted file mode 100644
index f1a6635b362..00000000000
--- a/pkgs/applications/window-managers/yeahwm/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ lib, stdenv, fetchurl
-, lesstif
-, libX11, libXext, libXmu, libXinerama }:
-
-stdenv.mkDerivation rec {
-
-  pname = "yeahwm";
-  version = "0.3.5";
-
-  src = fetchurl {
-    url = "http://phrat.de/${pname}_${version}.tar.gz";
-    sha256 = "01gfzjvb40n16m2ja4238nk08k4l203y6a61cydqvf68924fjb69";
-  };
-
-  buildInputs = [ lesstif libX11 libXext libXinerama libXmu ];
-
-  dontConfigure = true;
-
-  preBuild = ''
-    makeFlagsArray+=( CC="${stdenv.cc}/bin/cc" \
-                      XROOT="${libX11}" \
-                      INCLUDES="-I${libX11.dev}/include -I${libXext.dev}/include -I${libXinerama.dev}/include -I${libXmu.dev}/include" \
-                      LDPATH="-L${libX11}/lib -L${libXext}/lib -L${libXinerama}/lib -L${libXmu}/lib" \
-                      prefix="${placeholder "out"}" )
-  '';
-
-  # Workaround build failure on -fno-common toolchains like upstream
-  # gcc-10. Otherwise build fails as:
-  #   ld: screen.o:(.bss+0x40): multiple definition of `fg'; client.o:(.bss+0x40): first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
-
-  postInstall = ''
-    gzip -9 --stdout yeahwm.1 > yeahwm.1.gz
-    install -m644 yeahwm.1.gz ${placeholder "out"}/share/man/man1/
-  '';
-
-  meta = with lib;{
-    description = "An X window manager based on evilwm and aewm";
-    longDescription = ''
-      YeahWM is a h* window manager for X based on evilwm and aewm.
-
-      Features
-      - Sloppy Focus.
-      - BeOS-like tabbed titles, which can be repositioned.
-      - Support for Xinerama.
-      - Simple Appearance.
-      - Good keyboard control.
-      - Creative usage of the mouse.
-      - Respects aspect size hints.
-      - Solid resize and move operations.
-      - Virtual Desktops.
-      - "Magic" Screen edges for desktop switching.
-      - Snapping to other windows and screen borders when moving windows.
-      - Small binary size(ca. 23kb).
-      - Little resource usage.
-      - It's slick.
-    '';
-    homepage = "http://phrat.de/index.html";
-    license = licenses.isc;
-    maintainers = [ maintainers.AndersonTorres ];
-    platforms = libX11.meta.platforms;
-  };
-}