Merge staging-next into staging

7 files changed, 0 insertions, 234 deletions

diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix
deleted file mode 100644
index 8c354c616fd..00000000000
--- a/pkgs/applications/window-managers/windowmaker/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config
-, libX11, libXext, libXft, libXmu, libXinerama, libXrandr, libXpm
-, imagemagick, libpng, libjpeg, libexif, libtiff, giflib, libwebp }:
-
-stdenv.mkDerivation rec {
-  pname = "windowmaker";
-  version = "0.95.9";
-  srcName = "WindowMaker-${version}";
-
-  src = fetchurl {
-    url = "http://windowmaker.org/pub/source/release/${srcName}.tar.gz";
-    sha256 = "055pqvlkhipyjn7m6bb3fs4zz9rd1ynzl0mmwbhp05ihc3zmh8zj";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = [ libX11 libXext libXft libXmu libXinerama libXrandr libXpm
-                  imagemagick libpng libjpeg libexif libtiff giflib libwebp ];
-
-  configureFlags = [
-    "--with-x"
-    "--enable-modelock"
-    "--enable-randr"
-    "--enable-webp"
-    "--disable-magick" # Many distros reported imagemagick fails to be found
-  ];
-
-  meta = with lib; {
-    homepage = "http://windowmaker.org/";
-    description = "NeXTSTEP-like window manager";
-    longDescription = ''
-      Window Maker is an X11 window manager originally designed to
-      provide integration support for the GNUstep Desktop
-      Environment. In every way possible, it reproduces the elegant look
-      and feel of the NEXTSTEP user interface. It is fast, feature rich,
-      easy to configure, and easy to use. It is also free software, with
-      contributions being made by programmers from around the world.
-    '';
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.AndersonTorres ];
-  };
-}
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix
deleted file mode 100644
index e22b02825b7..00000000000
--- a/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib, stdenv, dockapps-sources, pkg-config, libX11, libXpm, libXext, alsa-lib }:
-
-stdenv.mkDerivation rec {
-  pname = "AlsaMixer.app";
-  version = "0.2.1";
-
-  src = dockapps-sources;
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libX11 libXpm libXext alsa-lib ];
-
-  setSourceRoot = ''
-    export sourceRoot=$(echo */${pname})
-  '';
-
-  dontConfigure = true;
-
-  preInstall = ''
-    install -d ${placeholder "out"}/bin
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    install -t ${placeholder "out"}/bin AlsaMixer.app
-    runHook postInstall
-  '';
-
-  postInstall = ''
-    ln -s ${placeholder "out"}/bin/AlsaMixer.app ${placeholder "out"}/bin/AlsaMixer
-  '';
-
-  meta = with lib; {
-    description = "Alsa mixer application for Windowmaker";
-    homepage = "https://www.dockapps.net/alsamixerapp";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.bstrik ];
-  };
-}
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
deleted file mode 100644
index 8a66fdbd67f..00000000000
--- a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ config, lib, pkgs }:
-
-lib.makeScope pkgs.newScope (self: with self; {
-
-  dockapps-sources = pkgs.fetchgit {
-    url = "https://repo.or.cz/dockapps.git";
-    rev = "b2b9d872ee61c9b329e4597c301e4417cbd9c3ea";
-    sha256 = "sha256-BuSnwPIj3gUWMjj++SK+117xm/77u4gXLQzRFttei0w=";
-  };
-
-  libdockapp = callPackage ./libdockapp.nix { };
-
-  AlsaMixer-app = callPackage ./AlsaMixer-app.nix { };
-
-  wmCalClock = callPackage ./wmCalClock.nix { };
-
-  wmsm-app = callPackage ./wmsm-app.nix { };
-
-  wmsystemtray = callPackage ./wmsystemtray.nix { };
-})
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix b/pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix
deleted file mode 100644
index aaf99ec932e..00000000000
--- a/pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, stdenv, dockapps-sources, autoreconfHook, pkg-config
-, libX11, libXext, libXpm, mkfontdir, fontutil }:
-
-stdenv.mkDerivation rec {
-  pname = "libdockapp";
-  version = "0.7.3";
-
-  src = dockapps-sources;
-
-  nativeBuildInputs = [ autoreconfHook pkg-config ];
-
-  buildInputs = [ libX11 libXext libXpm fontutil mkfontdir ];
-
-  setSourceRoot = ''
-    export sourceRoot=$(echo */${pname})
-  '';
-
-  # There is a bug on --with-font
-  configureFlags = [
-    "--with-examples=no"
-    "--with-font=no"
-  ];
-
-  meta = with lib; {
-    description = "A library providing a framework for dockapps";
-    homepage = "https://www.dockapps.net/libdockapp";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.bstrik ];
-  };
-}
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix
deleted file mode 100644
index 9f49b4508c1..00000000000
--- a/pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib, stdenv, dockapps-sources
-, libX11, libXpm, libXext }:
-
-stdenv.mkDerivation rec {
-  pname = "wmCalClock";
-  version = "1.25";
-
-  src = dockapps-sources;
-
-  buildInputs = [ libX11 libXpm libXext ];
-
-  setSourceRoot = ''
-    export sourceRoot=$(echo */${pname}/Src)
-  '';
-
-  preBuild = ''
-    makeFlagsArray+=(
-      CC="cc"
-      INCDIR="-I${libX11.dev}/include -I${libXext.dev}/include -I${libXpm.dev}/include"
-      LIBDIR="-I${libX11}/lib -I${libXext}/lib -I${libXpm}/lib"
-    )
-  '';
-
-  preInstall = ''
-    install -d ${placeholder "out"}/bin
-    install -d ${placeholder "out"}/man/man1
-  '';
-
-  installFlags = [ "DESTDIR=${placeholder "out"}" ];
-
-  meta = with lib; {
-    description = "A Calendar clock with antialiased text";
-    homepage = "https://www.dockapps.net/wmcalclock";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.bstrik ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix
deleted file mode 100644
index 5c68a39a1ea..00000000000
--- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ lib, stdenv, dockapps-sources
-, libX11
-, libXpm
-, libXext
-, libdockapp }:
-
-stdenv.mkDerivation rec {
-  pname = "wmsm.app";
-  version = "0.2.1";
-
-  src = dockapps-sources;
-
-  buildInputs = [ libX11 libXpm libXext libdockapp ];
-
-  setSourceRoot = ''
-    export sourceRoot=$(echo */${pname}/wmsm)
-  '';
-
-  env.NIX_CFLAGS_COMPILE = "-std=gnu89";
-
-  postPatch = ''
-    substituteInPlace Makefile \
-      --replace "PREFIX	= /usr/X11R6/bin" "" \
-      --replace "/usr/bin/install" "install"
-  '';
-
-  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
-
-  installPhase = ''
-    runHook preInstall
-    install -d ${placeholder "out"}/bin
-    runHook postInstall
-  '';
-
-  installFlags = [ "PREFIX=${placeholder "out"}/bin" ];
-
-  meta = with lib; {
-    description = "System monitor for Windowmaker";
-    homepage = "https://www.dockapps.net/wmsmapp";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.bstrik ];
-  };
-}
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
deleted file mode 100644
index ced4cad8055..00000000000
--- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, libX11, libXpm, libXext, libXfixes, libXmu }:
-
-stdenv.mkDerivation rec {
-  pname = "wmsystemtray";
-  version = "1.4";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}.tar.gz";
-     sha256 = "sha256-jt70NpHp//BxAA4pFmx8GtQgwJVukGgVEGHogcisl+k=";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libX11 libXpm libXext libXfixes libXmu ];
-
-  meta = with lib; {
-    description = "A system tray for Windowmaker";
-    homepage = "http://wmsystemtray.sourceforge.net";
-    license = licenses.gpl2Only;
-    maintainers = [ maintainers.bstrik ];
-    platforms = platforms.linux;
-  };
-}