Merge remote-tracking branch 'upstream/staging-next' into staging

30 files changed, 30 insertions, 746 deletions

diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix
index e52cf7efc6b5..246dbb7dd350 100644
--- a/pkgs/misc/emulators/cdemu/analyzer.nix
+++ b/pkgs/misc/emulators/cdemu/analyzer.nix
@@ -1,9 +1,9 @@
 { callPackage, makeWrapper, gobject-introspection, cmake
 , python3Packages, gtk3, glib, libxml2, gnuplot, gnome3, gdk-pixbuf, librsvg, intltool, libmirage }:
 let pkg = import ./base.nix {
-  version = "3.2.2";
+  version = "3.2.3";
   pkgName = "image-analyzer";
-  pkgSha256 = "0by3nd5c413cvk3jmv3md6q0axbiidy061g9dhf37qzwgcakcx8j";
+  pkgSha256 = "17yfjmf65s77214qassz6l01cjcni4cv06nzfsm7qrzw172fmci4";
 };
 in callPackage pkg {
   buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper
diff --git a/pkgs/misc/emulators/cdemu/client.nix b/pkgs/misc/emulators/cdemu/client.nix
index dbf471d35d1d..087b15cecd16 100644
--- a/pkgs/misc/emulators/cdemu/client.nix
+++ b/pkgs/misc/emulators/cdemu/client.nix
@@ -1,8 +1,8 @@
 { callPackage, python3Packages, intltool, makeWrapper }:
 let pkg = import ./base.nix {
-  version = "3.2.1";
+  version = "3.2.3";
   pkgName = "cdemu-client";
-  pkgSha256 = "1d8m24qvv62xcwafw5zs4yf39vs64kxl4idqcngd8yyjhrb2ykg5";
+  pkgSha256 = "1bvc2m63fx03rbp3ihgl2n7k24lwg5ydwkmr84gsjfcxp46q10zq";
 };
 in callPackage pkg {
   buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3
diff --git a/pkgs/misc/emulators/cdemu/daemon.nix b/pkgs/misc/emulators/cdemu/daemon.nix
index a80327ce91c0..db6ed7ddb47a 100644
--- a/pkgs/misc/emulators/cdemu/daemon.nix
+++ b/pkgs/misc/emulators/cdemu/daemon.nix
@@ -1,8 +1,8 @@
 { callPackage, glib, libao, intltool, libmirage }:
 let pkg = import ./base.nix {
-  version = "3.2.2";
+  version = "3.2.3";
   pkgName = "cdemu-daemon";
-  pkgSha256 = "0himyrhhfjsr4ff5aci7240bpm9x34h20pid412ci8fm16nk929b";
+  pkgSha256 = "022xzgwmncswb9md71w3ly3mjkdfc93lbij2llp2jamq8grxjjxr";
 };
 in callPackage pkg {
   buildInputs = [ glib libao libmirage intltool ];
diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix
index e06853b8f736..599531950a21 100644
--- a/pkgs/misc/emulators/cdemu/gui.nix
+++ b/pkgs/misc/emulators/cdemu/gui.nix
@@ -2,9 +2,9 @@
 , python3Packages, gtk3, glib, libnotify, intltool, gnome3, gdk-pixbuf, librsvg }:
 let
   pkg = import ./base.nix {
-    version = "3.2.1";
+    version = "3.2.3";
     pkgName = "gcdemu";
-    pkgSha256 = "0lmyvhbf57wcm8k2a33j2dhy4gblaiycy33q070gdrxi37xk7w5g";
+    pkgSha256 = "19vy1awha8s7cfja3a6npaf3rfy3pl3cbsh4vd609q9jz4v4lyg4";
   };
   inherit (python3Packages) python pygobject3;
 in callPackage pkg {
diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix
index 0ead78305cd0..cc3118ace151 100644
--- a/pkgs/misc/emulators/cdemu/libmirage.nix
+++ b/pkgs/misc/emulators/cdemu/libmirage.nix
@@ -3,9 +3,9 @@
 , pcre, utillinux, libselinux, libsepol }:
 
 let pkg = import ./base.nix {
-  version = "3.2.2";
+  version = "3.2.3";
   pkgName = "libmirage";
-  pkgSha256 = "0gwrfia0fyhi0b3p2pfyyvrcfcb0qysfzgpdqsqjqbx4xaqx5wpi";
+  pkgSha256 = "08mfvqyk3833ksfd47i4j3ppmrw5ry219km6h7lywdh9hm9x14yf";
 };
 in callPackage pkg {
   buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate intltool ];
diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix
index 71beaf125481..df25fb96eb1c 100644
--- a/pkgs/misc/emulators/cdemu/vhba.nix
+++ b/pkgs/misc/emulators/cdemu/vhba.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "vhba";
-  version = "20190410";
+  version = "20190831";
 
   src  = fetchurl {
     url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.bz2";
-    sha256 = "1513hq130raxp9z5grj54cwfjfxj05apipxg425j0zicii59a60c";
+    sha256 = "1ybbk6l06n0y11n5wnfmvdz0baizmq55l458ywimghdyz0n7g0ws";
   };
 
   makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ];
diff --git a/pkgs/misc/emulators/resim/default.nix b/pkgs/misc/emulators/resim/default.nix
new file mode 100644
index 000000000000..81acdf81f2ec
--- /dev/null
+++ b/pkgs/misc/emulators/resim/default.nix
@@ -0,0 +1,18 @@
+{ fetchFromGitHub, stdenv, cmake, qt4 }:
+
+stdenv.mkDerivation {
+  name = "resim";
+  src = fetchFromGitHub {
+    owner = "itszor";
+    repo = "resim";
+    rev = "cdc7808ceb7ba4ac00d0d08ca646b58615059150";
+    sha256 = "1743lngqxd7ai4k6cd4d1cf9h60z2pnvr2iynfs1zlpcj3w1hx0c";
+  };
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qt4 ];
+  installPhase = ''
+    mkdir -pv $out/{lib,bin}
+    cp -v libresim/libarmsim.so $out/lib/libarmsim.so
+    cp -v vc4emul/vc4emul $out/bin/vc4emul
+  '';
+}
diff --git a/pkgs/misc/themes/adapta-kde/default.nix b/pkgs/misc/themes/adapta-kde/default.nix
deleted file mode 100644
index a7624d2889bb..000000000000
--- a/pkgs/misc/themes/adapta-kde/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  pname = "adapta-kde-theme";
-  version = "20180512";
-
-  src = fetchFromGitHub {
-    owner = "PapirusDevelopmentTeam";
-    repo = "adapta-kde";
-    rev = version;
-    sha256 = "1lgpkylhzbayk892inql16sjyy9d3v126f9i1v7qgha1203rwcji";
-  };
-
-  makeFlags = ["PREFIX=$(out)" ];
-
-  # Make this a fixed-output derivation
-  outputHashMode = "recursive";
-  outputHashAlgo = "sha256";
-  ouputHash = "0rxhk8sp81vb2mngqr7kn9vlqyliq9aqj2d25igcr01v5axbxbzb";
-
-  meta = {
-    description = "A port of the Adapta theme for Plasma";
-    homepage = https://git.io/adapta-kde;
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.tadfisher ];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
deleted file mode 100644
index 02812b1f9397..000000000000
--- a/pkgs/misc/themes/adapta/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }:
-
-stdenv.mkDerivation rec {
-  pname = "adapta-gtk-theme";
-  version = "3.95.0.11";
-
-  src = fetchFromGitHub {
-    owner = "adapta-project";
-    repo = "adapta-gtk-theme";
-    rev = version;
-    sha256 = "19skrhp10xx07hbd0lr3d619vj2im35d8p9rmb4v4zacci804q04";
-  };
-
-  preferLocalBuild = true;
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkgconfig
-    parallel
-    sassc
-    inkscape
-    libxml2
-    glib.dev
-    gnome3.gnome-shell
-  ];
-
-  buildInputs = [
-    gdk-pixbuf
-    librsvg
-  ];
-
-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
-
-  postPatch = "patchShebangs .";
-
-  configureFlags = [
-    "--disable-gtk_legacy"
-    "--disable-gtk_next"
-    "--disable-unity"
-  ];
-
-  meta = with stdenv.lib; {
-    description = "An adaptive GTK theme based on Material Design Guidelines";
-    homepage = https://github.com/adapta-project/adapta-gtk-theme;
-    license = with licenses; [ gpl2 cc-by-sa-30 ];
-    platforms = platforms.linux;
-    maintainers = [ maintainers.romildo ];
-  };
-}
diff --git a/pkgs/misc/themes/adwaita-qt/default.nix b/pkgs/misc/themes/adwaita-qt/default.nix
deleted file mode 100644
index 16ccee8540bf..000000000000
--- a/pkgs/misc/themes/adwaita-qt/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, qtbase }:
-
-mkDerivation rec {
-  pname = "adwaita-qt";
-  version = "1.1.1";
-
-  src = fetchFromGitHub {
-    owner = "FedoraQt";
-    repo = pname;
-    rev = version;
-    sha256 = "1z1zl6b1190nffcdyjnwz2xy4s6cvgd98aas9z71l5iddwzy32fm";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    ninja
-  ];
-
-  buildInputs = [
-    qtbase
-  ];
-
-  postPatch = ''
-    # Fix plugin dir
-    substituteInPlace style/CMakeLists.txt \
-       --replace "DESTINATION \"\''${QT_PLUGINS_DIR}/styles" "DESTINATION \"$qtPluginPrefix/styles"
-  '';
-
-  meta = with lib; {
-    description = "A style to bend Qt applications to look like they belong into GNOME Shell";
-    homepage = https://github.com/FedoraQt/adwaita-qt;
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ worldofpeace ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/misc/themes/albatross/default.nix b/pkgs/misc/themes/albatross/default.nix
deleted file mode 100644
index 870b348cc320..000000000000
--- a/pkgs/misc/themes/albatross/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  pname = "Albatross";
-  version = "1.7.4";
-
-  src = fetchFromGitHub {
-    repo = "Albatross";
-    owner = "shimmerproject";
-    rev = "v${version}";
-    sha256 = "0mq87n2hxy44nzr567av24n5nqjaljhi1afxrn3mpjqdbkq7lx88";
-  };
-
-  dontBuild = true;
-
-  installPhase = ''
-    install -dm 755 $out/share/themes/Albatross
-    cp -dr --no-preserve='ownership' {LICENSE.GPL,README,index.theme,gtk-2.0,gtk-3.0,metacity-1,xfwm4} $out/share/themes/Albatross/
-  '';
-
-  meta = {
-    description = "A desktop Suite for Xfce";
-    homepage = https://github.com/shimmerproject/Albatross;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/misc/themes/arc-kde/default.nix b/pkgs/misc/themes/arc-kde/default.nix
deleted file mode 100644
index decdbdfac2dc..000000000000
--- a/pkgs/misc/themes/arc-kde/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation {
-  pname = "arc-kde-theme";
-  version = "2017-11-09";
-
-  src = fetchFromGitHub {
-    owner = "PapirusDevelopmentTeam";
-    repo = "arc-kde";
-    rev = "a0abe6fc5ebf74f9ae88b8a2035957cc16f706f5";
-    sha256 = "1p6f4ny97096nb054lrgyjwikmvg0qlbcnsjag7m5dfbclfnvzkg";
-  };
-
-  makeFlags = ["PREFIX=$(out)" ];
-
-  # Make this a fixed-output derivation
-  outputHashMode = "recursive";
-  outputHashAlgo = "sha256";
-  ouputHash = "2c2def57092a399aa1c450699cbb8639f47d751157b18db17";
-
-  meta = {
-    description = "A port of the arc theme for Plasma";
-    homepage = https://git.io/arc-kde;
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.nixy ];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/misc/themes/blackbird/default.nix
deleted file mode 100644
index 7ffefb1d67f6..000000000000
--- a/pkgs/misc/themes/blackbird/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, gtk-engine-murrine }:
-
-stdenv.mkDerivation rec {
-  pname = "Blackbird";
-  version = "2017-12-13";
-
-  src = fetchFromGitHub {
-    repo = pname;
-    owner = "shimmerproject";
-    rev = "a1c5674c0ec38b4cc8ba41d2c0e6187987ae7eb4";
-    sha256 = "0xskcw36ci2ykra5gir5pkrawh2qkcv18p4fp2kxivssbd20d4jw";
-  };
-
-  nativeBuildInputs = [ autoreconfHook ];
-
-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
-
-  meta = {
-    description = "Dark Desktop Suite for Gtk, Xfce and Metacity";
-    homepage = https://github.com/shimmerproject/Blackbird;
-    license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ];
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
-  };
-}
diff --git a/pkgs/misc/themes/clearlooks-phenix/default.nix b/pkgs/misc/themes/clearlooks-phenix/default.nix
deleted file mode 100644
index 7c1eb54f92f5..000000000000
--- a/pkgs/misc/themes/clearlooks-phenix/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  version = "7.0.1";
-  pname = "clearlooks-phenix";
-
-  src = fetchurl {
-    url = "https://github.com/jpfleury/clearlooks-phenix/archive/${version}.tar.gz";
-    sha256 = "1x2psfbhxc3bk3q795bafxv6p890yfsankfw64p44q4r1x0236ra";
-  };
-
-  dontBuild = true;
-  installPhase = ''
-    mkdir -p $out/share/themes/Clearlooks-Phenix
-    cp -r . $out/share/themes/Clearlooks-Phenix/
-  '';
-
-  preferLocalBuild = true;
-
-  meta = with stdenv.lib; {
-    description = "GTK3 port of the Clearlooks theme";
-    longDescription = ''
-      The Clearlooks-Phénix project aims at creating a GTK3 port of Clearlooks,
-      the default theme for Gnome 2. Style is also included for GTK2, Unity and
-      for Metacity, Openbox and Xfwm4 window managers.
-    '';
-    homepage = https://github.com/jpfleury/clearlooks-phenix;
-    downloadPage = https://github.com/jpfleury/clearlooks-phenix/releases;
-    license = licenses.gpl3;
-    maintainers = [ maintainers.prikhi ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/misc/themes/e17gtk/default.nix b/pkgs/misc/themes/e17gtk/default.nix
deleted file mode 100644
index 74f0a54ccef3..000000000000
--- a/pkgs/misc/themes/e17gtk/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  pname = "e17gtk";
-  version = "3.22.2";
-
-  src = fetchFromGitHub {
-    owner = "tsujan";
-    repo = "E17gtk";
-    rev = "V${version}";
-    sha256 = "1qwj1hmdlk8sdqhkrh60p2xg4av1rl0lmipdg5j0i40318pmiml1";
-  };
-
-  installPhase = ''
-    mkdir -p $out/share/{doc,themes}/E17gtk
-    cp -va index.theme gtk-2.0 gtk-3.0 metacity-1 $out/share/themes/E17gtk/
-    cp -va README.md WORKAROUNDS screenshot.jpg $out/share/doc/E17gtk/
-  '';
-
-  meta = {
-    description = "An Enlightenment-like GTK theme with sharp corners";
-    homepage = https://github.com/tsujan/E17gtk;
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
-  };
-}
diff --git a/pkgs/misc/themes/equilux-theme/default.nix b/pkgs/misc/themes/equilux-theme/default.nix
deleted file mode 100644
index f24524eb6b97..000000000000
--- a/pkgs/misc/themes/equilux-theme/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }:
-
-stdenv.mkDerivation rec {
-  pname = "equilux-theme";
-  version = "20181029";
-
-  src = fetchFromGitHub {
-    owner = "ddnexus";
-    repo = "equilux-theme";
-    rev = "equilux-v${version}";
-    sha256 = "0lv2yyxhnmnkwxp576wnb01id4fp734b5z5n0l67sg5z7vc2h8fc";
-  };
-
-  nativeBuildInputs = [ glib libxml2 bc ];
-
-  buildInputs = [ gnome3.gnome-themes-extra gdk-pixbuf librsvg ];
-
-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
-
-  dontBuild = true;
-
-  installPhase = ''
-    patchShebangs install.sh
-    sed -i install.sh \
-      -e "s|if .*which gnome-shell.*;|if true;|" \
-      -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}|"
-    mkdir -p $out/share/themes
-    ./install.sh --dest $out/share/themes
-    rm $out/share/themes/*/COPYING
-  '';
-
-  meta = with stdenv.lib; {
-    inherit (src.meta) homepage;
-    description = "A Material Design theme for GNOME/GTK based desktop environments";
-    license = licenses.gpl2;
-    platforms = platforms.all;
-    maintainers = [ maintainers.fpletz ];
-  };
-}
diff --git a/pkgs/misc/themes/gnome-breeze/default.nix b/pkgs/misc/themes/gnome-breeze/default.nix
deleted file mode 100644
index 200cc4bae051..000000000000
--- a/pkgs/misc/themes/gnome-breeze/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchgit }:
-
-stdenv.mkDerivation {
-  name = "gnome-breeze-20160526";
-  src = fetchgit {
-    url = "https://github.com/dirruk1/gnome-breeze";
-    sha256 = "0hkk0gqlnrs1m4rb5r84f5y96qfamrbiwm09z89yc32124x1a1lm";
-    rev = "49a5cd67a270e13a4c04a4b904f126ef728e9221";
-  };
-  installPhase = ''
-    mkdir -p $out/share/themes
-    cp -r Breeze* $out/share/themes
-  '';
-
-  preferLocalBuild = true;
-
-  meta = {
-    description = "A GTK theme built to match KDE's breeze theme";
-    homepage = https://github.com/dirruk1/gnome-breeze;
-    license = stdenv.lib.licenses.lgpl2;
-    maintainers = with stdenv.lib.maintainers; [ bennofs ];
-    platforms = stdenv.lib.platforms.all;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix b/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix
deleted file mode 100644
index 99ca221f5ba2..000000000000
--- a/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
-
-stdenv.mkDerivation {
-  name = "gtk-engine-bluecurve-1.0";
-
-  src = fetchurl {
-    url = "https://ftp.gnome.org/pub/gnome/teams/art.gnome.org/archive/themes/gtk2/GTK2-Wonderland-Engine-1.0.tar.bz2";
-    sha256 = "1nim3lhmbs5mw1hh76d9258c1p923854x2j6i30gmny812c7qjnm";
-  };
-
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  buildInputs = [ gtk2 ];
-
-  meta = {
-    description = "Original Bluecurve engine from Red Hat's artwork package";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.gnidorah ];
-  };
-}
diff --git a/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix b/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix
deleted file mode 100644
index 9acb7b25a0dd..000000000000
--- a/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
-
-stdenv.mkDerivation rec {
-  pname = "gtk-engine-murrine";
-  version = "0.98.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool gtk2 ];
-
-  meta = {
-    description = "A very flexible theme engine";
-    homepage = "https://gitlab.gnome.org/Archive/murrine";
-    license = stdenv.lib.licenses.lgpl3;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/misc/themes/gtk2/gtk-engines/default.nix b/pkgs/misc/themes/gtk2/gtk-engines/default.nix
deleted file mode 100644
index 2f56f6eb4c5c..000000000000
--- a/pkgs/misc/themes/gtk2/gtk-engines/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
-
-stdenv.mkDerivation {
-  name = "gtk-engines-2.20.2";
-
-  src = fetchurl {
-    url = "ftp://ftp.gnome.org/pub/gnome/sources/gtk-engines/2.20/gtk-engines-2.20.2.tar.bz2";
-    sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool gtk2 ];
-
-  meta = {
-    description = "Theme engines for GTK 2";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/misc/themes/kde2/default.nix b/pkgs/misc/themes/kde2/default.nix
deleted file mode 100644
index fac8c38eecae..000000000000
--- a/pkgs/misc/themes/kde2/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchFromGitHub, mkDerivation
-, cmake, extra-cmake-modules
-, qtbase, kcoreaddons, kdecoration }:
-
-let
-  version = "2017-03-15";
-in mkDerivation rec {
-  pname = "kde2-decoration";
-  inherit version;
-
-  src = fetchFromGitHub {
-    owner = "repos-holder";
-    repo = "kdecoration2-kde2";
-    rev = "2a9cf18ac0646b3532d4db2dd28bd73c4c229783";
-    sha256 = "0kilw6sd3blvm6gx9w4w5ivkjfxlv6wnyivw46pwwvhgxqymkbxk";
-  };
-
-  enableParallelBuilding = true;
-
-  nativeBuildInputs = [ cmake extra-cmake-modules ];
-
-  buildInputs = [ qtbase kcoreaddons kdecoration ];
-
-  meta = with stdenv.lib; {
-    description = "KDE 2 window decoration ported to Plasma 5";
-    homepage = src.meta.homepage;
-    license = licenses.bsd2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ gnidorah ];
-  };
-}
diff --git a/pkgs/misc/themes/numix-solarized/default.nix b/pkgs/misc/themes/numix-solarized/default.nix
deleted file mode 100644
index 0596141da80b..000000000000
--- a/pkgs/misc/themes/numix-solarized/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, fetchFromGitHub, python3, sass, glib, gdk-pixbuf, libxml2,
-  inkscape, optipng, gtk-engine-murrine
-}:
-
-stdenv.mkDerivation rec {
-  version = "20180913";
-  pname = "numix-solarized-gtk-theme";
-
-  src = fetchFromGitHub {
-    owner = "Ferdi265";
-    repo = "numix-solarized-gtk-theme";
-    rev = version;
-    sha256 = "1kda0lyqi3cxh163fbj8yyi6jj6pf0y980k4s0cmyi3hkh4cqyd5";
-  };
-
-  nativeBuildInputs = [ python3 sass glib gdk-pixbuf libxml2 inkscape optipng ];
-
-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
-
-  postPatch = ''
-    patchShebangs .
-    substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out
-    substituteInPlace scripts/render-assets.sh \
-      --replace /usr/bin/inkscape ${inkscape}/bin/inkscape \
-      --replace /usr/bin/optipng ${optipng}/bin/optipng
-  '';
-
-  buildPhase = "true";
-
-  installPhase = ''
-    for theme in *.colors; do
-      make THEME="''${theme/.colors/}" install
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Solarized versions of Numix GTK2 and GTK3 theme";
-    longDescription = ''
-      This is a fork of the Numix GTK theme that replaces the colors of the theme
-      and icons to use the solarized theme with a solarized green accent color.
-      This theme supports both the dark and light theme, just as Numix proper.
-    '';
-    homepage = https://github.com/Ferdi265/numix-solarized-gtk-theme;
-    downloadPage = https://github.com/Ferdi265/numix-solarized-gtk-theme/releases;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.offline ];
-  };
-}
diff --git a/pkgs/misc/themes/numix-sx/default.nix b/pkgs/misc/themes/numix-sx/default.nix
deleted file mode 100644
index 72e87e2e2740..000000000000
--- a/pkgs/misc/themes/numix-sx/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, gtk-engine-murrine }:
-
-stdenv.mkDerivation {
-  version = "2017-04-24";
-  pname = "numix-sx-gtk-theme";
-
-  src = fetchurl {
-    url = "https://dl.opendesktop.org/api/files/download/id/1493077417/Numix-SX.tar.xz";
-    sha256 = "7e1983924b2d90e89eddb3da8f4c43dc1326fe138fd191c8212c7904dcd618b0";
-  };
-
-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
-
-  dontBuild = true;
-
-  sourceRoot = ".";
-
-  installPhase = ''
-    install -dm 755 "$out/share/themes/"
-    cp -dr --no-preserve='ownership' Numix-SX-{Dark,FullDark,Light} "$out/share/themes/"
-  '';
-
-  meta = {
-    description = "Gray variation of Numix theme";
-    homepage = https://www.gnome-look.org/p/1117412/;
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.sauyon ];
-  };
-}
diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix
deleted file mode 100644
index e01f8174e9ea..000000000000
--- a/pkgs/misc/themes/numix/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchFromGitHub, sass, glib, libxml2, gdk-pixbuf
-, gtk-engine-murrine
-}:
-
-stdenv.mkDerivation rec {
-  version = "2.6.7";
-  pname = "numix-gtk-theme";
-
-  src = fetchFromGitHub {
-    repo = "numix-gtk-theme";
-    owner = "numixproject";
-    rev = version;
-    sha256 = "12mw0kr0kkvg395qlbsvkvaqccr90cmxw5rrsl236zh43kj8grb7";
-  };
-
-  nativeBuildInputs = [ sass glib libxml2 gdk-pixbuf ];
-
-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
-
-  postPatch = ''
-    substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out
-    patchShebangs .
-  '';
-
-  meta = {
-    description = "Modern flat theme with a combination of light and dark elements (GNOME, Unity, Xfce and Openbox)";
-    homepage = https://numixproject.github.io;
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
-  };
-}
diff --git a/pkgs/misc/themes/onestepback/default.nix b/pkgs/misc/themes/onestepback/default.nix
deleted file mode 100644
index 64ead2f75f4b..000000000000
--- a/pkgs/misc/themes/onestepback/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, unzip }:
-
-stdenv.mkDerivation rec {
-  pname = "onestepback";
-  version = "0.991";
-
-  srcs = [
-    (fetchurl {
-      url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-v${version}.zip";
-      sha256 = "1jfgcgzbb6ra9qs3zcp6ij0hfldzg3m0yjw6l6vf4kq1mdby1ghm";
-    })
-    (fetchurl {
-      url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-grey-brown-green-blue-v${version}.zip";
-      sha256 = "0i006h1asbpfdzajws0dvk9acplvcympzgxq5v3n8hmizd6yyh77";
-    })
-    (fetchurl {
-      url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-green-brown-v${version}.zip";
-      sha256 = "16p002lak6425gcskny4hzws8x9dgsm6j3a1r08y11rsz7d2hnmy";
-    })
-  ];
-
-  nativeBuildInputs = [ unzip ];
-
-  sourceRoot = ".";
-
-  installPhase = ''
-    mkdir -p  $out/share/themes
-    cp -a OneStepBack* $out/share/themes/
-    rm $out/share/themes/*/{LICENSE,README*}
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Gtk theme inspired by the NextStep look";
-    homepage = http://www.vide.memoire.free.fr/perso/OneStepBack;
-    license = licenses.gpl3;
-    platforms = platforms.all;
-    maintainers = [ maintainers.romildo ];
-  };
-}
diff --git a/pkgs/misc/themes/orion/default.nix b/pkgs/misc/themes/orion/default.nix
deleted file mode 100644
index 9ba8cd368cf7..000000000000
--- a/pkgs/misc/themes/orion/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchgit, gtk-engine-murrine }:
-
-stdenv.mkDerivation {
-  name = "orion-1.5";
-
-  src = fetchgit {
-    url = "https://github.com/shimmerproject/Orion.git";
-    rev = "refs/tags/v1.5";
-    sha256 = "1116yawv3fspkiq1ykk2wj0gza3l04b5nhldy0bayzjaj0y6fd89";
-  };
-
-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
-
-  installPhase = ''
-    mkdir -p $out/share/themes/orion
-    cp -r gtk-2.0 gtk-3.0 metacity-1 openbox-3 xfwm4 $out/share/themes/orion
-  '';
-
-  meta = {
-    homepage = https://github.com/shimmerproject/Orion;
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/misc/themes/paper/default.nix b/pkgs/misc/themes/paper/default.nix
deleted file mode 100644
index e7235a900cf9..000000000000
--- a/pkgs/misc/themes/paper/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }:
-
-stdenv.mkDerivation {
-  version = "2016-08-16";
-  pname = "paper-gtk-theme";
-
-  src = fetchFromGitHub {
-    owner = "snwh";
-    repo = "paper-gtk-theme";
-    rev = "f75724fd76fd2e5681a367cca246a51f845320c3";
-    sha256 = "0dqllzjk9ggnbh8vvy2c81p3wq6cj73r30hk7gqhrn8i91w8p896";
-  };
-
-  nativeBuildInputs = [ autoreconfHook ];
-
-  buildInputs = [ gtk_engines ];
-
-  postPatch = ''
-    substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out
-  '';
-
-  preferLocalBuild = true;
-
-  meta = with stdenv.lib; {
-    description = "A modern desktop theme suite featuring a mostly flat with a minimal use of shadows for depth";
-    homepage = https://snwh.org/paper;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.simonvandel maintainers.romildo ];
-  };
-}
diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix
deleted file mode 100644
index 0071e386e88c..000000000000
--- a/pkgs/misc/themes/qtcurve/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig, mkDerivation
-, gtk2, qtbase, qtsvg, qtx11extras # Toolkit dependencies
-, karchive, kconfig, kconfigwidgets, kio, frameworkintegration
-, kguiaddons, ki18n, kwindowsystem, kdelibs4support, kiconthemes
-, libpthreadstubs, pcre, libXdmcp, libX11, libXau # X11 dependencies
-}:
-
-let
-  version = "1.9";
-in mkDerivation {
-  pname = "qtcurve";
-  inherit version;
-  src = fetchurl {
-    url = "http://download.kde.org/stable/qtcurve/qtcurve-${version}.tar.xz";
-    sha256 = "169gdny1cdld0qnx3nqvx568zjzdba4pwp3gxapc1hdh2cymw7r8";
-  };
-
-  enableParallelBuilding = true;
-
-  nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ];
-
-  buildInputs = [
-    gtk2
-    qtbase qtsvg qtx11extras
-    karchive kconfig kconfigwidgets kio kiconthemes kguiaddons ki18n
-    kwindowsystem kdelibs4support frameworkintegration
-    libpthreadstubs
-    pcre
-    libXdmcp libX11 libXau
-  ];
-
-  preConfigure = ''
-    for i in qt5/CMakeLists.txt qt5/config/CMakeLists.txt
-    do
-      substituteInPlace $i \
-        --replace "{_Qt5_PLUGIN_INSTALL_DIR}" "{KDE_INSTALL_QTPLUGINDIR}"
-    done
-    substituteInPlace CMakeLists.txt \
-      --replace \$\{GTK2_PREFIX\} $out
-    substituteInPlace gtk2/style/CMakeLists.txt \
-      --replace \$\{GTK2_LIBDIR\} $out/lib
-    patchShebangs tools/gen-version.sh
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/QtCurve/qtcurve;
-    description = "Widget styles for Qt5/Plasma 5 and gtk2";
-    platforms = platforms.linux;
-    license = licenses.lgpl21Plus;
-    maintainers = [ maintainers.gnidorah ];
-  };
-}
diff --git a/pkgs/misc/themes/solarc/default.nix b/pkgs/misc/themes/solarc/default.nix
deleted file mode 100644
index 96843e8d78b4..000000000000
--- a/pkgs/misc/themes/solarc/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig,
-  gtk-engine-murrine, gtk3
-}:
-
-stdenv.mkDerivation {
-  pname = "solarc-gtk-theme";
-  version = "1.0.2";
-
-  src = fetchFromGitHub {
-    owner = "schemar";
-    repo = "solarc-theme";
-    rev = "d1eb117325b8e5085ecaf78df2eb2413423fc643";
-    sha256 = "005b66whyxba3403yzykpnlkz0q4m154pxpb4jzcny3fggy9r70s";
-  };
-
-  nativeBuildInputs = [ autoconf automake pkgconfig gtk3 ];
-
-  propagatedUserEnvPkgs = [ gtk-engine-murrine gtk3 ];
-
-  buildPhase = ''
-    ./autogen.sh --prefix=$out
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Solarized version of the Arc theme";
-    homepage = https://github.com/schemar/solarc-theme;
-    license = licenses.gpl3;
-    maintainers = [ maintainers.bricewge ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix
deleted file mode 100644
index 81c681f53715..000000000000
--- a/pkgs/misc/themes/vertex/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-engine-murrine }:
-
-stdenv.mkDerivation rec {
-  pname = "theme-vertex";
-  version = "20170128";
-
-  src = fetchFromGitHub {
-    owner = "horst3180";
-    repo = "vertex-theme";
-    rev = version;
-    sha256 = "0c9mhrs95ahz37djrv176vn41ywvj26ilwmnr1h9171giv6hid98";
-  };
-
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-
-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
-
-  configureFlags = [ "--disable-unity" ];
-
-  postInstall = ''
-    mkdir -p $out/share/plank/themes
-    cp -r extra/*-Plank $out/share/plank/themes
-
-    mkdir -p $out/share/doc/$pname/Chrome
-    cp -r extra/Chrome/*.crx $out/share/doc/$pname/Chrome
-    cp -r extra/Firefox $out/share/doc/$pname
-    cp AUTHORS README.md $out/share/doc/$pname/
-  '';
-
-  meta = with stdenv.lib; {
-    inherit (src.meta) homepage;
-    description = "Theme for GTK 3, GTK 2, Gnome-Shell, and Cinnamon";
-    license = licenses.gpl3;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ rycee romildo ];
-  };
-}