Merge pull request #167027 from helsinki-systems/drop/broken

2022-04-03 18:29:26 +02:00 · 2022-04-03 18:29:26 +02:00 · eb40e8633a
parent aafec3d778 2be6396776
commit eb40e8633a
93 changed files with 1 additions and 3474 deletions
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -850,7 +850,6 @@
  ./services/networking/ofono.nix
  ./services/networking/oidentd.nix
  ./services/networking/onedrive.nix
-  ./services/networking/openfire.nix
  ./services/networking/openvpn.nix
  ./services/networking/ostinato.nix
  ./services/networking/owamp.nix
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@ -91,6 +91,7 @@ with lib;
    (mkRemovedOptionModule [ "services" "shellinabox" ] "The corresponding package was removed from nixpkgs.")
    (mkRemovedOptionModule [ "services" "gogoclient" ] "The corresponding package was removed from nixpkgs.")
    (mkRemovedOptionModule [ "services" "virtuoso" ] "The corresponding package was removed from nixpkgs.")
+    (mkRemovedOptionModule [ "services" "openfire" ] "The corresponding package was removed from nixpkgs.")

    # Do NOT add any option renames here, see top of the file
  ];
--- a/nixos/modules/services/networking/openfire.nix
+++ b/nixos/modules/services/networking/openfire.nix
@ -1,56 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
-  ###### interface
-
-  options = {
-
-    services.openfire = {
-
-      enable = mkEnableOption "OpenFire XMPP server";
-
-      usePostgreSQL = mkOption {
-        type = types.bool;
-        default = true;
-        description = "
-          Whether you use PostgreSQL service for your storage back-end.
-        ";
-      };
-
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf config.services.openfire.enable {
-
-    assertions = singleton
-      { assertion = !(config.services.openfire.usePostgreSQL -> config.services.postgresql.enable);
-        message = "OpenFire configured to use PostgreSQL but services.postgresql.enable is not enabled.";
-      };
-
-    systemd.services.openfire = {
-      description = "OpenFire XMPP server";
-      wantedBy = [ "multi-user.target" ];
-      after = [ "networking.target" ] ++
-        optional config.services.openfire.usePostgreSQL "postgresql.service";
-      path = with pkgs; [ jre openfire coreutils which gnugrep gawk gnused ];
-      script = ''
-        export HOME=/tmp
-        mkdir /var/log/openfire || true
-        mkdir /etc/openfire || true
-        for i in ${pkgs.openfire}/conf.inst/*; do
-            if ! test -f /etc/openfire/$(basename $i); then
-                cp $i /etc/openfire/
-            fi
-        done
-        openfire start
-      ''; # */
-    };
-  };
-
-}
--- a/pkgs/applications/audio/foo-yc20/default.nix
+++ b/pkgs/applications/audio/foo-yc20/default.nix
@ -1,29 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkg-config }:
-
-stdenv.mkDerivation {
-  version = "unstable-2015-05-21";
-  pname = "foo-yc20";
-  src = fetchFromGitHub {
-    owner = "sampov2";
-    repo = "foo-yc20";
-    rev = "edd9d14c91229429b14270a181743e1046160ca8";
-    sha256 = "0i8261n95n4xic766h70xkrpbvw3sag96n1883ahmg6h7yb94avq";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libjack2 gtk2 lv2 faust ];
-
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  # remove lv2 until https://github.com/sampov2/foo-yc20/issues/6 is resolved
-  postInstallFixup = "rm -rf $out/lib/lv2";
-
-  meta = with lib; {
-    broken = true; # see: https://github.com/sampov2/foo-yc20/issues/7
-    description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20";
-    homepage = "https://github.com/sampov2/foo-yc20";
-    license = with licenses; [ bsd3 lgpl21 mpl11 ];
-    maintainers = [ maintainers.magnetophon ];
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/applications/emulators/fakenes/build.patch
+++ b/pkgs/applications/emulators/fakenes/build.patch
@ -1,84 +0,0 @@
-diff --git a/build/openal.cbd b/build/openal.cbd
-index d18e62d..74af061 100644
--- a/build/openal.cbd
-+++ b/build/openal.cbd
-@@ -23,7 +23,7 @@ CFLAGS += ' -DUSE_OPENAL'
- # --
- 
- do ifplat unix
-   LDFLAGS += ' `openal-config --libs`'
-+   LDFLAGS += ' -lopenal'
- else
-    LDFLAGS += ' -lOpenAL32'
- done
-diff --git a/build/alleggl.cbd b/build/alleggl.cbd
-index e2708ff..e826371 100644
--- a/build/alleggl.cbd
-+++ b/build/alleggl.cbd
-@@ -22,7 +22,7 @@ CFLAGS += ' -DUSE_ALLEGROGL'
- 
- # --
- 
-LIBAGL = agl
-+LIBAGL = alleggl
- 
- ifopt debug LIBAGL = 'agld'
-
-diff --git a/src/apu.cpp b/src/apu.cpp
-index af59f1c..893a798 100644
--- a/src/apu.cpp
-+++ b/src/apu.cpp
-@@ -1930,7 +1930,7 @@ static void amplify(real& sample)
-          gain -= releaseRate;
-       }
- 
-      real output = (1.0 / max(gain, EPSILON));
-+      real output = (1.0 / MAX(gain, EPSILON));
-       output = fixf(output, apu_agc_gain_floor, apu_agc_gain_ceiling);
-       sample *= output;
-    }
-diff --git a/src/audio.cpp b/src/audio.cpp
-index b9650dc..c21c05e 100644
--- a/src/audio.cpp
-+++ b/src/audio.cpp
-@@ -7,6 +7,7 @@
-    You must read and accept the license prior to use. */
- 
- #include <allegro.h>
-+#include <cstdio>
- #include <cstdlib>
- #include <cstring>
- #include <vector>
-@@ -234,7 +235,7 @@ void audio_update(void)
-          const unsigned queuedFrames = (audioQueue.size() / audio_channels);
-          if(queuedFrames > 0) {
-             // Determine how many frames we want to make room for.
-            const unsigned framesToAdd = min(queuedFrames, audio_buffer_size_frames);
-+            const unsigned framesToAdd = MIN(queuedFrames, audio_buffer_size_frames);
-             // Make room for the frames in the buffer.
-             const unsigned framesToMove = (audioBufferedFrames - framesToAdd);
-             if(framesToMove > 0) {
-@@ -258,7 +259,7 @@ void audio_update(void)
-          // Determine how many frames are available in the buffer.
-          const unsigned bufferableFrames = (audio_buffer_size_frames - audioBufferedFrames);
-          // Determine the number of frames to copy to the buffer.
-         const unsigned framesToCopy = min(queuedFrames, bufferableFrames);
-+         const unsigned framesToCopy = MIN(queuedFrames, bufferableFrames);
- 
-          // Copy frames to the buffer.
-          for(unsigned frame = 0; frame < framesToCopy; frame++) {
-diff --git a/src/include/common.h b/src/include/common.h
-index be28795..e2d21d1 100644
--- a/src/include/common.h
-+++ b/src/include/common.h
-@@ -41,8 +41,10 @@ extern "C" {
- #define true   TRUE
- #define false  FALSE
- 
-+/*
- #define min(x,y)   MIN((x),(y))
- #define max(x,y)   MAX((x),(y))
-+*/
- 
- #define true_or_false(x)   ((x) ? true : false)
- 
--- a/pkgs/applications/emulators/fakenes/default.nix
+++ b/pkgs/applications/emulators/fakenes/default.nix
@ -1,34 +0,0 @@
-{lib, stdenv, fetchurl, allegro, openal, libGLU, libGL, zlib, hawknl, freeglut, libX11,
-  libXxf86vm, libXcursor, libXpm }:
-
-stdenv.mkDerivation rec {
-  pname = "fakenes";
-  version = "0.5.9-beta3";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/fakenes/fakenes-${version}.tar.gz";
-    sha256 = "026h67s4pzc1vma59pmzk02iy379255qbai2q74wln9bxqcpniy4";
-  };
-
-  buildInputs = [ allegro openal libGLU libGL zlib hawknl freeglut libX11
-    libXxf86vm libXcursor libXpm ];
-
-  hardeningDisable = [ "format" ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp fakenes $out/bin
-  '';
-
-  NIX_LDFLAGS = "-lX11 -lXxf86vm -lXcursor -lXpm";
-
-  patches = [ ./build.patch ];
-
-  meta = {
-    homepage = "http://fakenes.sourceforge.net/";
-    license = lib.licenses.gpl2Plus;
-    description = "Portable Open Source NES Emulator";
-    platforms = lib.platforms.linux;
-    broken = true;
-  };
-}
--- a/pkgs/applications/emulators/qmc2/default.nix
+++ b/pkgs/applications/emulators/qmc2/default.nix
@ -1,41 +0,0 @@
-{ lib, stdenv
-, fetchurl, qttools, pkg-config
-, minizip, zlib
-, qtbase, qtsvg, qtmultimedia, qtwebkit, qttranslations, qtxmlpatterns
-, rsync, SDL2, xwininfo
-, util-linux
-, xorg
-}:
-
-stdenv.mkDerivation rec {
-  pname = "qmc2";
-  version = "0.195";
-
-  src = fetchurl {
-      url = "mirror://sourceforge/project/qmc2/qmc2/${version}/${pname}-${version}.tar.gz";
-      sha256 = "1dzmjlfk8pdspns6zg1jmd5fqzg8igd4q38cz4a1vf39lx74svns";
-  };
-
-  preBuild = ''
-    patchShebangs scripts
-  '';
-
-  nativeBuildInputs = [ qttools pkg-config ];
-  buildInputs = [ minizip qtbase qtsvg qtmultimedia qtwebkit
-                  qttranslations qtxmlpatterns rsync SDL2
-                  xwininfo zlib util-linux xorg.libxcb ];
-
-  makeFlags = [ "DESTDIR=$(out)"
-                "PREFIX=/"
-                "DATADIR=/share/"
-                "SYSCONFDIR=/etc" ];
-
-  meta = with lib; {
-    description = "A Qt frontend for MAME/MESS";
-    homepage = "https://qmc2.batcom-it.net";
-    license = licenses.gpl2;
-    maintainers = [ ];
-    platforms = platforms.linux;
-    broken = true;
-  };
-}
--- a/pkgs/applications/graphics/photivo/default.nix
+++ b/pkgs/applications/graphics/photivo/default.nix
@ -1,54 +0,0 @@
-{ lib
-, stdenv
-, fetchhg
-, fetchpatch
-, cmake
-, qt4
-, fftw
-, graphicsmagick_q16
-, lcms2
-, lensfun
-, pkg-config
-, libjpeg
-, exiv2
-, liblqr1
-}:
-
-stdenv.mkDerivation {
-  pname = "photivo";
-  version = "2014-01-25";
-
-  src = fetchhg {
-    url = "http://code.google.com/p/photivo/";
-    rev = "d687864489da";
-    sha256 = "0f6y18k7db2ci6xn664zcwm1g1k04sdv7gg1yd5jk41bndjb7z8h";
-  };
-
-  patches = [
-    # Patch fixing build with lensfun >= 0.3, taken from
-    # https://www.linuxquestions.org/questions/slackware-14/photivo-4175530230/#post5296578
-    (fetchpatch {
-      url = "https://www.linuxquestions.org/questions/attachment.php?attachmentid=17287&d=1420577220";
-      name = "lensfun-0.3.patch";
-      sha256 = "0ys45x4r4bjjlx0zpd5d56rgjz7k8gxili4r4k8zx3zfka4a3zwv";
-    })
-    ./gcc6.patch
-  ];
-
-  postPatch = '' # kinda icky
-    sed -e '/("@INSTALL@")/d' \
-        -e s,@INSTALL@,$out/share/photivo, \
-        -i Sources/ptSettings.cpp
-    sed '1i#include <math.h>' -i Sources/filters/ptFilter_StdCurve.cpp
-  '';
-
-  nativeBuildInputs = [ cmake pkg-config ];
-
-  buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ];
-
-  meta = with lib; {
-    platforms = platforms.linux;
-    license = licenses.gpl3;
-    broken = true; # exiv2 0.27.1 FTBFS
-  };
-}
--- a/pkgs/applications/graphics/photivo/gcc6.patch
+++ b/pkgs/applications/graphics/photivo/gcc6.patch
@ -1,13 +0,0 @@
-diff --git c/Sources/ptImage.cpp i/Sources/ptImage.cpp
-index 9c95093..623c157 100755
--- c/Sources/ptImage.cpp
-+++ i/Sources/ptImage.cpp
-@@ -5291,7 +5291,7 @@ ptImage* ptImage::Box(const uint16_t MaxRadius, float* Mask) {
-         NewRow = NewRow < 0? -NewRow : NewRow > Height1? Height1_2-NewRow : NewRow ;
-         NewRow *= m_Width;
-         for(j = -IntRadius; j <= IntRadius; j++) {
-          if (Dist[abs(i)][abs(j)] < Radius) {
-+          if (Dist[int16_t(abs(i))][int16_t(abs(j))] < Radius) {
-             NewCol = Col+j;
-             NewCol = NewCol < 0? -NewCol : NewCol > Width1? Width1_2-NewCol : NewCol ;
- 
--- a/pkgs/applications/networking/mailreaders/notbit/default.nix
+++ b/pkgs/applications/networking/mailreaders/notbit/default.nix
@ -1,30 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config,
-  gettext, openssl
-}:
-
-with lib;
-
-stdenv.mkDerivation {
-  pname = "notbit";
-  version = "2018-01-09";
-
-  src = fetchFromGitHub {
-    owner  = "bpeel";
-    repo   = "notbit";
-    rev    = "8b5d3d2da8ce54abae2536b4d97641d2c798cff3";
-    sha256 = "1623n0lvx42mamvb2vwin5i38hh0nxpxzmkr5188ss2x7m20lmii";
-  };
-
-  nativeBuildInputs = [ autoreconfHook pkg-config ];
-
-  buildInputs = [ openssl gettext ];
-
-  meta = {
-    description = "A minimal Bitmessage client";
-    homepage = "https://github.com/bpeel/notbit";
-    license = licenses.mit;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ mog ];
-    broken = true;
-  };
-}
--- a/pkgs/applications/science/astronomy/openspace/assets.patch
+++ b/pkgs/applications/science/astronomy/openspace/assets.patch
@ -1,100 +0,0 @@
-diff --git a/data/assets/scene/solarsystem/planets/jupiter/jup310.asset b/data/assets/scene/solarsystem/planets/jupiter/jup310.asset
-index c15f6d9..1f8ddaf 100755
--- a/data/assets/scene/solarsystem/planets/jupiter/jup310.asset
-+++ b/data/assets/scene/solarsystem/planets/jupiter/jup310.asset
-@@ -1,8 +1,8 @@
-local Kernels = asset.syncedResource({
-    Name = "Jupiter Spice Kernels (jup310)",
-    Type = "TorrentSynchronization",
-    Identifier = "jup310",
-    Magnet = "magnet:?xt=urn:btih:E8B7D7E136DE1C6249158B254BFC8B9ECE2A0539&dn=jup310.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
-})
-+-- local Kernels = asset.syncedResource({
-+--     Name = "Jupiter Spice Kernels (jup310)",
-+--     Type = "TorrentSynchronization",
-+--     Identifier = "jup310",
-+--     Magnet = "magnet:?xt=urn:btih:E8B7D7E136DE1C6249158B254BFC8B9ECE2A0539&dn=jup310.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
-+-- })
- 
-asset.export("Kernels", Kernels .. '/jup310.bsp')
-+-- asset.export("Kernels", Kernels .. '/jup310.bsp')
-diff --git a/data/assets/scene/solarsystem/planets/mars/mar097.asset b/data/assets/scene/solarsystem/planets/mars/mar097.asset
-index e77d67d..8d738a6 100755
--- a/data/assets/scene/solarsystem/planets/mars/mar097.asset
-+++ b/data/assets/scene/solarsystem/planets/mars/mar097.asset
-@@ -1,8 +1,8 @@
-local Kernels = asset.syncedResource({
-    Name = "Mars Spice Kernels",
-    Type = "TorrentSynchronization",
-    Identifier = "mat097",
-    Magnet = "magnet:?xt=urn:btih:308F326B9AF864294D73042FBBED33B17291E27E&dn=mar097.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
-})
-+-- local Kernels = asset.syncedResource({
-+--     Name = "Mars Spice Kernels",
-+--     Type = "TorrentSynchronization",
-+--     Identifier = "mat097",
-+--     Magnet = "magnet:?xt=urn:btih:308F326B9AF864294D73042FBBED33B17291E27E&dn=mar097.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
-+-- })
- 
-asset.export("Kernels", Kernels .. '/mar097.bsp')
-+-- asset.export("Kernels", Kernels .. '/mar097.bsp')
-diff --git a/data/assets/scene/solarsystem/planets/neptune/nep081.asset b/data/assets/scene/solarsystem/planets/neptune/nep081.asset
-index e9c49ce..cfb5fac 100755
--- a/data/assets/scene/solarsystem/planets/neptune/nep081.asset
-+++ b/data/assets/scene/solarsystem/planets/neptune/nep081.asset
-@@ -1,8 +1,8 @@
-local Kernels = asset.syncedResource({
-    Name = "Neptune Spice Kernels (nep081)",
-    Type = "TorrentSynchronization",
-    Identifier = "nep081",
-    Magnet = "magnet:?xt=urn:btih:A6079CF8D4BF3B6BB38F4F9F633CB7724FF91693&dn=nep081.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
-})
-+-- local Kernels = asset.syncedResource({
-+--     Name = "Neptune Spice Kernels (nep081)",
-+--     Type = "TorrentSynchronization",
-+--     Identifier = "nep081",
-+--     Magnet = "magnet:?xt=urn:btih:A6079CF8D4BF3B6BB38F4F9F633CB7724FF91693&dn=nep081.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
-+-- })
- 
-asset.export("Kernels", Kernels .. '/nep081.bsp')
-+-- asset.export("Kernels", Kernels .. '/nep081.bsp')
-diff --git a/data/assets/scene/solarsystem/planets/saturn/sat375.asset b/data/assets/scene/solarsystem/planets/saturn/sat375.asset
-index a55f2ed..f904b3c 100755
--- a/data/assets/scene/solarsystem/planets/saturn/sat375.asset
-+++ b/data/assets/scene/solarsystem/planets/saturn/sat375.asset
-@@ -1,8 +1,8 @@
-local Kernels = asset.syncedResource({
-    Name = "Saturn Spice Kernels (sat375)",
-    Type = "TorrentSynchronization",
-    Identifier = "sat375",
-    Magnet = "magnet:?xt=urn:btih:79083d2069df389e65d7688bb326c7aaf1953845&dn=sat375.bsp"
-})
-+-- local Kernels = asset.syncedResource({
-+--     Name = "Saturn Spice Kernels (sat375)",
-+--     Type = "TorrentSynchronization",
-+--     Identifier = "sat375",
-+--     Magnet = "magnet:?xt=urn:btih:79083d2069df389e65d7688bb326c7aaf1953845&dn=sat375.bsp"
-+-- })
- 
-asset.export("Kernels", Kernels .. '/sat375.bsp')
-+-- asset.export("Kernels", Kernels .. '/sat375.bsp')
-diff --git a/data/assets/scene/solarsystem/planets/uranus/ura111.asset b/data/assets/scene/solarsystem/planets/uranus/ura111.asset
-index 665d059..8f95f34 100755
--- a/data/assets/scene/solarsystem/planets/uranus/ura111.asset
-+++ b/data/assets/scene/solarsystem/planets/uranus/ura111.asset
-@@ -1,8 +1,8 @@
-local Kernels = asset.syncedResource({
-    Name = "Uranus Spice Kernels (ura111)",
-    Type = "TorrentSynchronization",
-    Identifier = "ura111",
-    Magnet = "magnet:?xt=urn:btih:26C4903D1A12AE439480F31B45BAEB5781D2B305&dn=ura111.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
-})
-+-- local Kernels = asset.syncedResource({
-+--     Name = "Uranus Spice Kernels (ura111)",
-+--     Type = "TorrentSynchronization",
-+--     Identifier = "ura111",
-+--     Magnet = "magnet:?xt=urn:btih:26C4903D1A12AE439480F31B45BAEB5781D2B305&dn=ura111.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
-+-- })
- 
-asset.export("Kernels", Kernels .. '/ura111.bsp')
-+-- asset.export("Kernels", Kernels .. '/ura111.bsp')
--- a/pkgs/applications/science/astronomy/openspace/config.patch
+++ b/pkgs/applications/science/astronomy/openspace/config.patch
@ -1,49 +0,0 @@
-diff --git a/openspace.cfg b/openspace.cfg
-index c86830b..e7f89d9 100755
--- a/openspace.cfg
-+++ b/openspace.cfg
-@@ -2,18 +2,21 @@
- -- require('scripts/configuration_helper.lua')
- -- which defines helper functions useful to customize the configuration
- 
-+userdir = os.getenv("HOME") .. "/.openspace/"
-+os.execute("mkdir -p " .. userdir)
-+
- return {
-     -- Determines which SGCT configuration file is loaded, that is, if there rendering
-     -- occurs in a single window, a fisheye projection, or a dome cluster system
- 
-     -- A regular 1280x720 window
-    SGCTConfig = sgct.config.single{},
-+    -- SGCTConfig = sgct.config.single{},
- 
-     -- A regular 1920x1080 window
-     -- SGCTConfig = sgct.config.single{1920, 1080},
-     
-     -- A windowed 1920x1080 fullscreen
-    -- SGCTConfig = sgct.config.single{1920, 1080, border=false, windowPos={0,0}, shared=true, name="WV_OBS_SPOUT1"},
-+    SGCTConfig = sgct.config.single{1920, 1080, border=false, windowPos={0,0}, shared=true, name="WV_OBS_SPOUT1"},
- 
-     -- A 1k fisheye rendering
-     -- SGCTConfig = sgct.config.fisheye{1024, 1024},
-@@ -53,15 +56,15 @@ return {
-         TASKS = "${DATA}/tasks",
-         WEB = "${DATA}/web",
- 
-        CACHE = "${BASE}/cache",
-+        CACHE  = userdir .. "cache",
-         CONFIG = "${BASE}/config",
-        DOCUMENTATION = "${BASE}/documentation",
-        LOGS = "${BASE}/logs",
-+        DOCUMENTATION = userdir .. "documentation",
-+        LOGS    = userdir .. "logs",
-         MODULES = "${BASE}/modules",
-         SCRIPTS = "${BASE}/scripts",
-         SHADERS = "${BASE}/shaders",
-        SYNC = "${BASE}/sync",
-        TESTDIR = "${BASE}/tests"
-+        SYNC    = userdir .. "sync",
-+        TESTDIR = userdir .. "tests"
-     },
-     Fonts = {
-         Mono = "${FONTS}/Bitstream-Vera-Sans-Mono/VeraMono.ttf",
--- a/pkgs/applications/science/astronomy/openspace/constexpr.patch
+++ b/pkgs/applications/science/astronomy/openspace/constexpr.patch
@ -1,91 +0,0 @@
-diff --git a/include/openspace/util/distanceconversion.h b/include/openspace/util/distanceconversion.h
-index 80a3a96..7059752 100755
--- a/include/openspace/util/distanceconversion.h
-+++ b/include/openspace/util/distanceconversion.h
-@@ -159,24 +159,34 @@ constexpr const char* nameForDistanceUnit(DistanceUnit unit, bool pluralForm = f
- }
- 
- constexpr DistanceUnit distanceUnitFromString(const char* unitName) {
-+    int result = -1;
-+  
-     int i = 0;
-     for (const char* val : DistanceUnitNamesSingular) {
-         if (ghoul::equal(unitName, val)) {
-            return static_cast<DistanceUnit>(i);
-+            result = i;
-+            break;
-         }
-         ++i;
-     }
- 
-    i = 0;
-    for (const char* val : DistanceUnitNamesPlural) {
-        if (ghoul::equal(unitName, val)) {
-            return static_cast<DistanceUnit>(i);
-+    if (result == -1) {
-+        i = 0;
-+        for (const char* val : DistanceUnitNamesPlural) {
-+            if (ghoul::equal(unitName, val)) {
-+                result = i;
-+                break;
-+            }
-+            ++i;
-         }
-        ++i;
-     }
- 
-    ghoul_assert(false, "Unit name is not a valid name");
-    throw ghoul::MissingCaseException();
-+    if (result != -1)
-+        return static_cast<DistanceUnit>(result);
-+    else {
-+        ghoul_assert(false, "Unit name is not a valid name");
-+        throw ghoul::MissingCaseException();
-+    }
- }
- 
- 
-diff --git a/include/openspace/util/timeconversion.h b/include/openspace/util/timeconversion.h
-index a36c92a..699bca9 100755
--- a/include/openspace/util/timeconversion.h
-+++ b/include/openspace/util/timeconversion.h
-@@ -142,23 +142,32 @@ constexpr const char* nameForTimeUnit(TimeUnit unit, bool pluralForm = false) {
- }
- 
- constexpr TimeUnit timeUnitFromString(const char* unitName) {
-+    int result = -1;
-+    
-     int i = 0;
-     for (const char* val : TimeUnitNamesSingular) {
-         if (ghoul::equal(unitName, val)) {
-            return static_cast<TimeUnit>(i);
-+            result = i;
-+            break;
-         }
-         ++i;
-     }
- 
-    i = 0;
-    for (const char* val : TimeUnitNamesPlural) {
-        if (ghoul::equal(unitName, val)) {
-            return static_cast<TimeUnit>(i);
-+    if (result == -1) {
-+        i = 0;
-+        for (const char* val : TimeUnitNamesPlural) {
-+            if (ghoul::equal(unitName, val)) {
-+                result = i;
-+                break;
-+            }
-+            ++i;
-         }
-        ++i;
-     }
- 
-    throw ghoul::MissingCaseException();
-+    if (result != -1)
-+        return static_cast<TimeUnit>(result);
-+    else
-+        throw ghoul::MissingCaseException();
- }
- 
- std::pair<double, std::string> simplifyTime(double seconds,
--- a/pkgs/applications/science/astronomy/openspace/default.nix
+++ b/pkgs/applications/science/astronomy/openspace/default.nix
@ -1,90 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, cmake
-, curl, boost, gdal, glew, soil
-, libX11, libXi, libXxf86vm, libXcursor, libXrandr, libXinerama }:
-
-stdenv.mkDerivation rec {
-  version = "0.11.1";
-  pname = "openspace";
-
-  src = fetchFromGitHub {
-    owner  = "OpenSpace";
-    repo   = "OpenSpace";
-    rev    = "a65eea61a1b8807ce3d69e9925e75f8e3dfb085d";
-    sha256 = "0msqixf30r0d41xmfmzkdfw6w9jkx2ph5clq8xiwrg1jc3z9q7nv";
-    fetchSubmodules = true;
-  };
-
-  nativeBuildInputs = [ cmake makeWrapper ];
-  buildInputs = [
-    curl boost gdal glew soil
-    libX11 libXi libXxf86vm libXcursor libXrandr libXinerama
-  ];
-
-  glmPlatformH = fetchurl {
-    url    = "https://raw.githubusercontent.com/g-truc/glm/dd48b56e44d699a022c69155c8672caacafd9e8a/glm/simd/platform.h";
-    sha256 = "0y91hlbgn5va7ijg5mz823gqkq9hqxl00lwmdwnf8q2g086rplzw";
-  };
-
-  # See <https://github.com/g-truc/glm/issues/726>
-  prePatch = ''
-    cp ${glmPlatformH} ext/sgct/include/glm/simd/platform.h
-    cp ${glmPlatformH} ext/ghoul/ext/glm/glm/simd/platform.h
-  '';
-
-  patches = [
-    # See <https://github.com/opensgct/sgct/issues/13>
-    ./vrpn.patch
-
-    ./constexpr.patch
-    ./config.patch
-
-    # WARNING: This patch disables some slow torrents in a very dirty way.
-    ./assets.patch
-  ];
-
-  bundle = "$out/usr/share/openspace";
-
-  preConfigure = ''
-    cmakeFlagsArray=(
-      $cmakeFlagsArray
-      "-DCMAKE_BUILD_TYPE="
-      "-DCMAKE_INSTALL_PREFIX=${bundle}"
-    )
-  '';
-
-  preInstall = ''
-    mkdir -p $out/bin
-    mkdir -p ${bundle}
-  '';
-
-  postInstall = ''
-    cp ext/spice/libSpice.so       ${bundle}/lib
-    cp ext/ghoul/ext/lua/libLua.so ${bundle}/lib
-  '';
-
-  postFixup = ''
-    for bin in ${bundle}/bin/*
-    do
-      rpath=$(patchelf --print-rpath $bin)
-      patchelf --set-rpath $rpath:${bundle}/lib $bin
-
-      name=$(basename $bin)
-      makeWrapper $bin $out/bin/$name --run "cd ${bundle}"
-    done
-  '';
-
-  meta = {
-    description     = "Open-source astrovisualization project";
-    longDescription = ''
-      OpenSpace is open source interactive data visualization software
-      designed to visualize the entire known universe and portray our
-      ongoing efforts to investigate the cosmos.
-
-      WARNING: This build is not very usable for now.
-    '';
-    homepage  = "https://www.openspaceproject.com/";
-    license   = lib.licenses.mit;
-    platforms = lib.platforms.linux;
-    broken = true; # fails to build
-  };
-}
--- a/pkgs/applications/science/astronomy/openspace/vrpn.patch
+++ b/pkgs/applications/science/astronomy/openspace/vrpn.patch
@ -1,13 +0,0 @@
-diff --git a/ext/sgct/src/deps/vrpn/vrpn_Connection.C b/ext/sgct/src/deps/vrpn/vrpn_Connection.C
-index d6ffdc5..f90a2b2 100755
--- a/ext/sgct/src/deps/vrpn/vrpn_Connection.C
-+++ b/ext/sgct/src/deps/vrpn/vrpn_Connection.C
-@@ -2489,7 +2489,7 @@ static int vrpn_start_server(const char *machine, char *server_name, char *args,
- #if defined(sparc) || defined(FreeBSD) || defined(_AIX) || defined(__ANDROID__)
-             int status; // doesn't exist on sparc_solaris or FreeBSD
- #else
-            union wait status;
-+            int status;
- #endif
- 
-             /* Check to see if they called back yet. */
--- a/pkgs/applications/science/biology/ncbi-tools/default.nix
+++ b/pkgs/applications/science/biology/ncbi-tools/default.nix
@ -1,34 +0,0 @@
-{stdenv, fetchurl, cpio}:
-
-# The NCBI package only builds on 32bits - on 64bits it breaks because
-# of position dependent code. Debian packagers have written replacement
-# make files(!). Either we use these, or negotiate a version which can
-# be pushed upstream to NCBI.
-#
-# Another note: you may want the older and deprecated C-libs at ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/2008/Mar_17_2008/NCBI_C_Toolkit/ncbi_c--Mar_17_2008.tar.gz
-
-stdenv.mkDerivation rec {
-  pname = "ncbi_tools";
-  version = "Dec_31_2008";
-  src = fetchurl {
-    url = "ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/2008/${version}/ncbi_cxx--${version}.tar.gz";
-    sha256 = "1b2v0dcdqn3bysgdkj57sxmd6s0hc9wpnxssviz399g6plhxggbr";
-  };
-
-  configureFlags = [
-    "--without-debug"
-    "--with-bin-release"
-    "--with-dll"
-    "--without-static"
-  ];
-  buildInputs = [ cpio ];
-
-  meta = {
-    description = "NCBI Bioinformatics toolbox (incl. BLAST)";
-    longDescription = "The NCBI Bioinformatics toolsbox, including command-line utilties, libraries and include files. No X11 support";
-    homepage = "http://www.ncbi.nlm.nih.gov/IEB/ToolBox/";
-    license = "GPL";
-    priority = 5;   # zlib.so gives a conflict with zlib
-    broken = true;
-  };
-}
--- a/pkgs/applications/science/logic/jonprl/default.nix
+++ b/pkgs/applications/science/logic/jonprl/default.nix
@ -1,35 +0,0 @@
-{ fetchgit, lib, stdenv, smlnj, which }:
-
-stdenv.mkDerivation rec {
-  pname = "jonprl";
-  version = "0.1.0";
-
-  src = fetchgit {
-    url = "https://github.com/jonsterling/JonPRL.git";
-    deepClone = true;
-    rev = "refs/tags/v${version}";
-    sha256 = "0czs13syvnw8fz24d075n4pmsyfs8rs8c7ksmvd7cgb3h55fvp4p";
-  };
-
-  buildInputs = [ smlnj which ];
-
-  installPhase = ''
-    mkdir -p "$out/bin"
-    cp bin/.heapimg.* "$out/bin/"
-    build/mkexec.sh "${smlnj}/bin/sml" "$out" jonprl
-  '';
-
-  meta = {
-    description = "Proof Refinement Logic - Computational Type Theory";
-    longDescription = ''
-      An proof refinement logic for computational type theory
-      based on Brouwer-realizability & meaning explanations.
-      Inspired by Nuprl
-    '';
-    homepage = "https://github.com/jonsterling/JonPRL";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ puffnfresh ];
-    platforms = lib.platforms.linux;
-    broken = true;
-  };
-}
--- a/pkgs/applications/science/logic/lean2/default.nix
+++ b/pkgs/applications/science/logic/lean2/default.nix
@ -1,37 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, gmp, mpfr, python2
-, gperftools, ninja, makeWrapper }:
-
-stdenv.mkDerivation {
-  pname = "lean2";
-  version = "2017-07-22";
-
-  src = fetchFromGitHub {
-    owner  = "leanprover";
-    repo   = "lean2";
-    rev    = "34dbd6c3ae612186b8f0f80d12fbf5ae7a059ec9";
-    sha256 = "1xv3j487zhh1zf2b4v19xzw63s2sgjhg8d62a0kxxyknfmdf3khl";
-  };
-
-  nativeBuildInputs = [ cmake makeWrapper ninja ];
-  buildInputs = [ gmp mpfr python2 gperftools ];
-
-  preConfigure = ''
-    patchShebangs bin/leantags
-    cd src
-  '';
-
-  cmakeFlags = [ "-GNinja" ];
-
-  postInstall = ''
-    wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin
-  '';
-
-  meta = with lib; {
-    description = "Automatic and interactive theorem prover (version with HoTT support)";
-    homepage    = "http://leanprover.github.io";
-    license     = licenses.asl20;
-    platforms   = platforms.unix;
-    maintainers = with maintainers; [ thoughtpolice gebner ];
-    broken = true;
-  };
-}
--- a/pkgs/applications/science/logic/otter/default.nix
+++ b/pkgs/applications/science/logic/otter/default.nix
@ -1,53 +0,0 @@
-{lib, stdenv, fetchurl, tcsh, libXaw, libXt, libX11}:
-let
-  s = # Generated upstream information
-  rec {
-    version = "3.3f";
-    name = "otter";
-    url = "https://www.cs.unm.edu/~mccune/otter/otter-${version}.tar.gz";
-    sha256 = "16mc1npl7sk9cmqhrf3ghfmvx29inijw76f1b1lsykllaxjqqb1r";
-  };
-  buildInputs = [
-    tcsh libXaw libXt libX11
-  ];
-in
-stdenv.mkDerivation {
-  name = "${s.name}-${s.version}";
-  inherit buildInputs;
-  src = fetchurl {
-    inherit (s) url sha256;
-  };
-
-  hardeningDisable = [ "format" ];
-
-  buildPhase = ''
-    find . -name Makefile | xargs sed -i -e "s@/bin/rm@$(type -P rm)@g"
-    find . -name Makefile | xargs sed -i -e "s@/bin/mv@$(type -P mv)@g"
-    find . -perm -0100 -type f | xargs sed -i -e "s@/bin/csh@$(type -P csh)@g"
-    find . -perm -0100 -type f | xargs sed -i -e "s@/bin/rm@$(type -P rm)@g"
-    find . -perm -0100 -type f | xargs sed -i -e "s@/bin/mv@$(type -P mv)@g"
-
-    sed -i -e "s/^XLIBS *=.*/XLIBS=-lXaw -lXt -lX11/" source/formed/Makefile
-
-    make all
-    make -C examples all
-    make -C examples-mace2 all
-    make -C source/formed realclean
-    make -C source/formed formed
-  '';
-
-  installPhase = ''
-    mkdir -p "$out"/{bin,share/otter}
-    cp bin/* source/formed/formed "$out/bin/"
-    cp -r examples examples-mace2 documents README* Legal Changelog Contents index.html "$out/share/otter/"
-  '';
-
-  meta = {
-    inherit (s) version;
-    description = "A reliable first-order theorem prover";
-    license = lib.licenses.publicDomain ;
-    maintainers = [lib.maintainers.raskin];
-    platforms = lib.platforms.linux;
-    broken = true;
-  };
-}
--- a/pkgs/applications/science/misc/openmvs/default.nix
+++ b/pkgs/applications/science/misc/openmvs/default.nix
@ -1,77 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, pkg-config
-, cmake
-, eigen
-, opencv
-, ceres-solver
-, cgal
-, boost
-, vcg
-, gmp
-, mpfr
-, glog
-, gflags
-, libjpeg_turbo
-}:
-
-stdenv.mkDerivation {
-  pname = "openmvs";
-  version = "unstable-2018-05-26";
-
-  src = fetchFromGitHub {
-    owner = "cdcseacave";
-    repo = "openmvs";
-    rev = "939033c55b50478339084431aac2c2318041afad";
-    sha256 = "12dgkwwfdp24581y3i41gsd1k9hq0aw917q0ja5s0if4qbmc8pni";
-  };
-
-  buildInputs = [ eigen opencv ceres-solver cgal boost vcg gmp mpfr glog gflags libjpeg_turbo ];
-
-  nativeBuildInputs = [ cmake pkg-config ];
-
-  preConfigure = ''
-    cmakeFlagsArray=(
-      $cmakeFlagsArray
-      "-DCMAKE_CXX_FLAGS=-std=c++11"
-      "-DBUILD_SHARED_LIBS=ON"
-      "-DBUILD_STATIC_RUNTIME=ON"
-      "-DINSTALL_BIN_DIR=$out/bin"
-      "-DVCG_DIR=${vcg}"
-      "-DCGAL_ROOT=${cgal}/lib/cmake/CGAL"
-      "-DCERES_DIR=${ceres-solver}/lib/cmake/Ceres/"
-    )
-  '';
-
-  postFixup = ''
-    rp=$(patchelf --print-rpath $out/bin/DensifyPointCloud)
-    patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/DensifyPointCloud
-
-    rp=$(patchelf --print-rpath $out/bin/InterfaceVisualSFM)
-    patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/InterfaceVisualSFM
-
-    rp=$(patchelf --print-rpath $out/bin/ReconstructMesh)
-    patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/ReconstructMesh
-
-    rp=$(patchelf --print-rpath $out/bin/RefineMesh)
-    patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/RefineMesh
-
-    rp=$(patchelf --print-rpath $out/bin/TextureMesh)
-    patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/TextureMesh
-  '';
-
-  cmakeDir = "./";
-
-  dontUseCmakeBuildDir = true;
-
-  meta = with lib; {
-    description = "A library for computer-vision scientists and especially targeted to the Multi-View Stereo reconstruction community";
-    homepage = "http://cdcseacave.github.io/openMVS/";
-    license = licenses.agpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ mdaiter ];
-    # 20190414-174115: CMake cannot find CGAL which is passed as build input
-    broken = true;
-  };
-}
--- a/pkgs/applications/version-management/bitkeeper/default.nix
+++ b/pkgs/applications/version-management/bitkeeper/default.nix
@ -1,56 +0,0 @@
-{ lib, stdenv, fetchurl, perl, gperf, bison, groff
-, pkg-config, libXft, pcre
-, libtomcrypt, libtommath, lz4 }:
-
-stdenv.mkDerivation rec {
-  pname = "bitkeeper";
-  version = "7.3.1ce";
-
-  src = fetchurl {
-    url = "https://www.bitkeeper.org/downloads/${version}/bk-${version}.src.tar.gz";
-    sha256 = "0l6jwvcg4s1q00vb01hdv58jgv03l8x5mhjl73cwgfiff80zx147";
-  };
-
-  hardeningDisable = [ "fortify" ];
-
-  enableParallelBuilding = true;
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    perl gperf bison groff libXft
-    pcre libtomcrypt libtommath lz4
-  ];
-
-  postPatch = ''
-        substituteInPlace port/unix_platform.sh \
-                --replace /bin/rm rm
-        substituteInPlace ./undo.c \
-                --replace /bin/cat cat
-  '';
-
-  sourceRoot = "bk-${version}/src";
-  buildPhase = ''
-    make -j6 V=1 p
-    make image
-  '';
-
-  installPhase = ''
-    ./utils/bk-* $out/bitkeeper
-    mkdir -p $out/bin
-    $out/bitkeeper/bk links $out/bin
-    chmod g-w $out
-  '';
-
-  meta = {
-    description     = "A distributed version control system";
-    longDescription = ''
-      BitKeeper is a fast, enterprise-ready, distributed SCM that
-      scales up to very large projects and down to tiny ones.
-    '';
-    homepage    = "https://www.bitkeeper.org/";
-    license     = lib.licenses.asl20;
-    platforms   = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ wscott thoughtpolice ];
-    broken      = true; # seems to fail on recent glibc versions
-  };
-}
--- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
@ -1,58 +0,0 @@
-{ lib, stdenv
-, fetchFromGitHub
-, openssl_1_0_2
-, zlib
-, libssh
-, cmake
-, perl
-, pkg-config
-, rustPlatform
-, curl
-, libiconv
-, CoreFoundation
-, Security
-}:
-
-with rustPlatform;
-
-buildRustPackage rec {
-  pname = "git-dit";
-  version = "0.4.0";
-
-  src = fetchFromGitHub {
-    owner = "neithernut";
-    repo = "git-dit";
-    rev = "v${version}";
-    sha256 = "1sx6sc2dj3l61gbiqz8vfyhw5w4xjdyfzn1ixz0y8ipm579yc7a2";
-  };
-
-  cargoSha256 = "1vbcwl4aii0x4l8w9jhm70vi4s95jr138ly65jpkkv26rl6zjiph";
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    perl
-  ];
-
-  buildInputs = [
-    openssl_1_0_2
-    libssh
-    zlib
-  ] ++ lib.optionals (stdenv.isDarwin) [
-    curl
-    libiconv
-    CoreFoundation
-    Security
-  ];
-
-  meta = with lib; {
-    inherit (src.meta) homepage;
-    description = "Decentralized Issue Tracking for git";
-    # This has not had a release in years and its cargo vendored dependencies
-    # fail to compile. It also depends on an unsupported openssl:
-    # https://github.com/NixOS/nixpkgs/issues/77503
-    broken = true;
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ Profpatsch matthiasbeyer ];
-  };
-}
--- a/pkgs/applications/window-managers/clfswm/default.nix
+++ b/pkgs/applications/window-managers/clfswm/default.nix
@ -1,51 +0,0 @@
-{ lib, stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4
-, makeWrapper }:
-
-stdenv.mkDerivation {
-  pname = "clfswm";
-  version = "unstable-2016-11-12";
-
-  src = fetchgit {
-    url = "https://gitlab.common-lisp.net/clfswm/clfswm.git";
-    rev = "3c7721dba6339ebb4f8c8d7ce2341740fa86f837";
-    sha256 = "0hynzh3a1zr719cxfb0k4cvh5lskzs616hwn7p942isyvhwzhynd";
-  };
-
-  buildInputs = [
-    texinfo4 makeWrapper autoconf
-    sbcl
-    lispPackages.clx
-    lispPackages.cl-ppcre
-    xdpyinfo
-  ];
-
-  patches = [ ./require-clx.patch ];
-
-  # Stripping destroys the generated SBCL image
-  dontStrip = true;
-
-  configurePhase = ''
-    substituteInPlace load.lisp --replace \
-      ";; (setf *contrib-dir* \"/usr/local/lib/clfswm/\")" \
-      "(setf *contrib-dir* \"$out/lib/clfswm/\")"
-  '';
-
-  installPhase = ''
-    mkdir -pv $out/bin
-    make DESTDIR=$out install
-
-    # Paths in the compressed image $out/bin/clfswm are not
-    # recognized by Nix. Add explicit reference here.
-    mkdir $out/nix-support
-    echo ${xdpyinfo} ${lispPackages.clx} ${lispPackages.cl-ppcre} > $out/nix-support/depends
-  '';
-
-  meta = with lib; {
-    description = "A(nother) Common Lisp FullScreen Window Manager";
-    homepage    = "https://common-lisp.net/project/clfswm/";
-    license     = licenses.gpl3;
-    maintainers = with maintainers; [ robgssp ];
-    platforms   = platforms.linux;
-    broken      = true;
-  };
-}
--- a/pkgs/applications/window-managers/clfswm/require-clx.patch
+++ b/pkgs/applications/window-managers/clfswm/require-clx.patch
@ -1,13 +0,0 @@
-diff --git a/load.lisp b/load.lisp
-index c8c4cf0..8c9ca2e 100644
--- a/load.lisp
-+++ b/load.lisp
-@@ -111,6 +111,8 @@ from $XDG_CONFIG_HOME/clfswm/clfswmrc")
- ;;;------------------
- (load-info "Requiring CLX")
- 
-+(require 'clx)
-+
- ;;; Loading clisp dynamic module. This part needs clisp >= 2.50
- ;;#+(AND CLISP (not CLX))
- ;;(when (fboundp 'require)
--- a/pkgs/data/documentation/rnrs/r3rs.nix
+++ b/pkgs/data/documentation/rnrs/r3rs.nix
@ -1,7 +0,0 @@
-{ fetchurl, stdenv, texinfo }:
-
-import ./common.nix {
-  inherit fetchurl stdenv texinfo;
-  revision = 3;
-  sha256 = "0knrpkr74s8yn4xcqxkqpgxmzdmzrvahh1n1csqc1wwd2rb4vnpr";
-}
--- a/pkgs/development/compilers/aldor/default.nix
+++ b/pkgs/development/compilers/aldor/default.nix
@ -1,54 +0,0 @@
-{ fetchFromGitHub, lib, stdenv, gmp, which, flex, bison, makeWrapper
-, autoconf, automake, libtool, jdk, perl }:
-
-stdenv.mkDerivation {
-  pname = "aldor";
-  version = "1.2.0";
-
-  src = fetchFromGitHub {
-    owner = "aldorlang";
-    repo = "aldor";
-    rev = "15471e75f3d65b93150f414ebcaf59a03054b68d";
-    sha256 = "sha256-phKCghCeM+/QlxjIxfNQySo+5XMRqfOqlS9kgp07YKc=";
-  };
-
-  nativeBuildInputs = [ makeWrapper autoconf automake ];
-  buildInputs = [ gmp which flex bison libtool jdk perl ];
-
-  preConfigure = ''
-    cd aldor ;
-    ./autogen.sh ;
-  '';
-
-  postInstall = ''
-    for prog in aldor unicl javagen ;
-    do
-      wrapProgram $out/bin/$prog --set ALDORROOT $out \
-        --prefix PATH : ${jdk}/bin \
-        --prefix PATH : ${stdenv.cc}/bin ;
-    done
-  '';
-
-  meta = {
-    # Please become a maintainer to fix this package
-    broken = true;
-    homepage = "http://www.aldor.org/";
-    description = "Programming language with an expressive type system";
-    license = lib.licenses.asl20;
-
-    longDescription = ''
-      Aldor is a programming language with an expressive type system well-suited
-      for mathematical computing and which has been used to develop a number of
-      computer algebra libraries. Originally known as A#, Aldor was conceived as
-      an extension language for the Axiom system, but is now used more in other settings.
-      In Aldor, types and functions are first class values that can be constructed
-      and manipulated within programs. Pervasive support for dependent types allows
-      static checking of dynamic objects. What does this mean for a normal user? Aldor
-      solves many difficulties encountered in widely-used object-oriented programming
-      languages. It allows programs to use a natural style, combining the more attractive
-      and powerful properties of functional, object-oriented and aspect-oriented styles.
-    '';
-
-    platforms = lib.platforms.linux;
-  };
-}
--- a/pkgs/development/compilers/aliceml/default.nix
+++ b/pkgs/development/compilers/aliceml/default.nix
@ -1,59 +0,0 @@
-{lib, stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkg-config, perl, gnome2, gtk2, pango, sqlite, libxml2, zlib, gmp, smlnj }:
-
-stdenv.mkDerivation {
-  pname = "aliceml";
-  version = "1.4-7d44dc8e";
-
-  src = fetchgit {
-    url = "https://github.com/aliceml/aliceml";
-    rev = "7d44dc8e4097c6f85888bbf4ff86d51fe05b0a08";
-    sha256 = "1xpvia00cpig0i7qvz29sx7xjic6kd472ng722x4rapz8mjnf8bk";
-    fetchSubmodules = true;
-  };
-
-  gecodeSrc = fetchurl {
-    url = "http://www.gecode.org/download/gecode-1.3.1.tar.gz";
-    sha256 = "0mgc6llbq166jmlq3alvagqsg3730670zvbwwkdgsqklw70v9355";
-  };
-
-  nativeBuildInputs = [ autoconf automake ];
-  buildInputs = [
-    gcc glibc
-    libtool gnumake
-    file which zsh m4 gtk2 zlib gmp
-    gnome2.libgnomecanvas pango sqlite
-    libxml2 pkg-config perl smlnj
-  ];
-
-  makePatch = ./make.patch;
-  seamPatch = ./seam.patch;
-
-  phases = [ "unpackPhase" "patchPhase" "configurePhase" "buildPhase" ];
-
-  patchPhase = ''
-    sed -i -e "s@wget ..GECODE_URL. -O - | tar xz@tar xf $gecodeSrc@" make/Makefile
-    patch -p1 <$makePatch
-    patch -p1 <$seamPatch
-  '';
-
-  configurePhase = ''
-    make -C make setup PREFIX="$out"
-  '';
-
-  buildPhase = ''
-    gmp="${gmp.dev}" zlib="${zlib.dev}" PATH=$PATH:`pwd`/seam-support/install/bin make -C make all PREFIX="$out"
-  '';
-
-  meta = {
-    description = "Functional programming language based on Standard ML";
-    longDescription = ''
-      Alice ML is a functional programming language based on Standard ML,
-      extended with rich support for concurrent, distributed, and constraint
-      programming.
-    '';
-    homepage = "https://www.ps.uni-saarland.de/alice/";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.doublec ];
-    broken = true;
-  };
-}
--- a/pkgs/development/compilers/aliceml/make.patch
+++ b/pkgs/development/compilers/aliceml/make.patch
@ -1,20 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 6a55b06..84a6000 100644
--- a/make/Makefile
-+++ b/make/Makefile
-@@ -387,6 +387,7 @@ configure-seam-linux64:
- 	 ../sources/configure \
- 		--prefix='$(PREFIX)' \
- 		--with-warnings=yes \
-+		--with-zlib='$(zlib)' \
- 		--disable-lightning)
- 
- .PHONY: configure-seam-darwin64
-@@ -434,6 +435,7 @@ configure-alice-ll-linux:
- 	(cd $(PWD)/alice/build && \
- 	 ../sources/vm-seam/configure \
- 		--prefix='$(PREFIX)' \
-+		--with-gmp='$(gmp)' \
- 		--with-warnings=yes)
- 
- .PHONY:	rebuild-alice-ll
--- a/pkgs/development/compilers/aliceml/seam.patch
+++ b/pkgs/development/compilers/aliceml/seam.patch
@ -1,13 +0,0 @@
-diff --git a/Makefile.cvs b/Makefile.cvs
-index b59434a..cd1316f 100644
--- a/seam/sources/Makefile.cvs
-+++ b/seam/sources/Makefile.cvs
-@@ -32,7 +32,7 @@ autotools:
- 	aclocal -I .
- 	autoconf
- 	automake --add-missing
-	cd libltdl; aclocal; autoconf; automake --add-missing
-+	cd libltdl; chmod +w *; aclocal; autoconf; automake --add-missing
- 
- lightning:
- 	rm -rf lightning
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@ -1,68 +0,0 @@
-{ lib, stdenv, fetchgit, cmake, pkg-config, boost, libunwind, libmemcached
-, pcre, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php
-, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5
-, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
-, libxslt, freetype, gdb, git, perl, libmysqlclient, gmp, libyaml, libedit
-, libvpx, imagemagick, fribidi, gperf, which, ocamlPackages
-}:
-
-stdenv.mkDerivation rec {
-  pname = "hhvm";
-  version = "3.23.2";
-
-  # use git version since we need submodules
-  src = fetchgit {
-    url    = "https://github.com/facebook/hhvm.git";
-    rev    = "HHVM-${version}";
-    sha256 = "1nic49j8nghx82lgvz0b95r78sqz46qaaqv4nx48p8yrj9ysnd7i";
-    fetchSubmodules = true;
-  };
-
-  nativeBuildInputs = [ cmake pkg-config flex bison ];
-  buildInputs =
-    [ boost libunwind libmysqlclient libmemcached pcre gdb git perl
-      libevent gd curl libxml2 icu openssl zlib php expat libcap
-      oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
-      libelf uwimap binutils cyrus_sasl pam glog libpng libxslt libkrb5
-      gmp libyaml libedit libvpx imagemagick fribidi gperf which
-      ocamlPackages.ocaml ocamlPackages.ocamlbuild
-    ];
-
-  patches = [
-    ./flexible-array-members-gcc6.patch
-  ];
-
-  dontUseCmakeBuildDir = true;
-  NIX_LDFLAGS = "-lpam -L${pam}/lib";
-
-  # work around broken build system
-  NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2";
-
-  # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly
-  # (setting it to an absolute path causes include files to go to $out/$out/include,
-  #  because the absolute path is interpreted with root at $out).
-  cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=include" ];
-
-  prePatch = ''
-    substituteInPlace ./configure \
-      --replace "/usr/bin/env bash" ${stdenv.shell}
-    substituteInPlace ./third-party/ocaml/CMakeLists.txt \
-      --replace "/bin/bash" ${stdenv.shell}
-    perl -pi -e 's/([ \t(])(isnan|isinf)\(/$1std::$2(/g' \
-      hphp/runtime/base/*.cpp \
-      hphp/runtime/ext/std/*.cpp \
-      hphp/runtime/ext_zend_compat/php-src/main/*.cpp \
-      hphp/runtime/ext_zend_compat/php-src/main/*.h
-    sed '1i#include <functional>' -i third-party/mcrouter/src/mcrouter/lib/cycles/Cycles.h
-    patchShebangs .
-  '';
-
-  meta = {
-    description = "High-performance JIT compiler for PHP/Hack";
-    homepage    = "https://hhvm.com";
-    license     = "PHP/Zend";
-    platforms   = [ "x86_64-linux" ];
-    maintainers = [ lib.maintainers.thoughtpolice ];
-    broken = true; # Since 2018-04-21, see https://hydra.nixos.org/build/73059373
-  };
-}
--- a/pkgs/development/compilers/hhvm/flexible-array-members-gcc6.patch
+++ b/pkgs/development/compilers/hhvm/flexible-array-members-gcc6.patch
@ -1,20 +0,0 @@
-diff --git a/third-party/re2/src/re2/dfa.cc b/third-party/re2/src/re2/dfa.cc
-index 483f678..3aa3610 100644
--- a/third-party/re2/src/re2/dfa.cc
-+++ b/third-party/re2/src/re2/dfa.cc
-@@ -101,8 +101,13 @@ class DFA {
-     uint flag_;         // Empty string bitfield flags in effect on the way
-                         // into this state, along with kFlagMatch if this
-                         // is a matching state.
-    std::atomic<State*> next_[];    // Outgoing arrows from State,
-                        // one per input byte class
-+// Work around the bug affecting flexible array members in GCC 6.1 and 6.2.
-+// (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70932)
-+#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ == 6 && __GNUC_MINOR__ >= 1
-+    std::atomic<State*> next_[0];   // Outgoing arrows from State, one per input byte class
-+#else
-+    std::atomic<State*> next_[];    // Outgoing arrows from State, one per input byte class
-+#endif
-   };
-
-   enum {
--- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
+++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
@ -1,34 +0,0 @@
-{ lib, stdenv, fetchurl, xlibsWrapper, ncurses }:
-
-stdenv.mkDerivation ({
-
-  pname = "metaocaml";
-  version = "3.09-alpha-30";
-
-  src = fetchurl {
-    url = "http://www.metaocaml.org/dist/old/MetaOCaml_309_alpha_030.tar.gz";
-    sha256 = "0migbn0zwfb7yb24dy7qfqi19sv3drqcv4369xi7xzpds2cs35fd";
-  };
-
-  prefixKey = "-prefix ";
-  configureFlags = ["-no-tk" "-x11lib" xlibsWrapper];
-  buildFlags = [ "world" "bootstrap" "world.opt" ];
-  buildInputs = [xlibsWrapper ncurses];
-  installTargets = "install installopt";
-  patchPhase = ''
-    CAT=$(type -tp cat)
-    sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
-  '';
-  postBuild = ''
-    mkdir -p $out/include
-    ln -sv $out/lib/ocaml/caml $out/include/caml
-  '';
-
-  meta = {
-    homepage = "http://www.metaocaml.org/";
-    license = with lib.licenses; [ qpl lgpl2 ];
-    description = "A compiled, type-safe, multi-stage programming language";
-    broken = true;
-  };
-
-})
--- a/pkgs/development/embedded/stm32/betaflight/default.nix
+++ b/pkgs/development/embedded/stm32/betaflight/default.nix
@ -1,64 +0,0 @@
-{ lib, stdenv, fetchFromGitHub
-, gcc-arm-embedded, binutils-arm-embedded, python2
-, skipTargets ? [
-  # These targets do not build, for the reasons listed, along with the last version checked.
-  # Probably all of the issues with these targets need to be addressed upstream.
-  "AG3X"       # 3.4.0-rc4: has not specified a valid STM group, must be one of F1, F3, F405, F411 or F7x5. Have you prepared a valid target.mk?
-  "ALIENWHOOP" # 3.4.0-rc4: has not specified a valid STM group, must be one of F1, F3, F405, F411 or F7x5. Have you prepared a valid target.mk?
-  "FURYF3"     # 3.4.0-rc4: flash region overflow
-  "OMNINXT"    # 3.4.0-rc4: has not specified a valid STM group, must be one of F1, F3, F405, F411 or F7x5. Have you prepared a valid target.mk?
-]}:
-
-stdenv.mkDerivation rec {
-
-  pname = "betaflight";
-  version = "3.4.0-rc4";
-
-  src = fetchFromGitHub {
-    owner = "betaflight";
-    repo = "betaflight";
-    rev = "8e9e7574481b1abba9354b24f41eb31054943785"; # Always use a commit id here!
-    sha256 = "1wyp23p876xbfi9z6gm4xn1nwss3myvrjjjq9pd3s0vf5gkclkg5";
-  };
-
-  nativeBuildInputs = [
-    gcc-arm-embedded binutils-arm-embedded
-    python2
-  ];
-
-  postPatch = ''
-    sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev.
-    sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex
-
-    substituteInPlace Makefile \
-      --replace "--specs=nano.specs" ""
-  '';
-
-  enableParallelBuilding = true;
-
-  preBuild = ''
-    buildFlagsArray=(
-      "NOBUILD_TARGETS=${toString skipTargets}"
-      "GCC_REQUIRED_VERSION=$(arm-none-eabi-gcc -dumpversion)"
-      all
-    )
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out
-    cp obj/*.hex $out
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Flight controller software (firmware) used to fly multi-rotor craft and fixed wing craft";
-    homepage = "https://github.com/betaflight/betaflight";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ elitak ];
-    broken = true;
-  };
-
-}
--- a/pkgs/development/embedded/stm32/inav/default.nix
+++ b/pkgs/development/embedded/stm32/inav/default.nix
@ -1,56 +0,0 @@
-{ lib, stdenv, fetchFromGitHub
-, gcc-arm-embedded, binutils-arm-embedded, ruby
-}:
-
-stdenv.mkDerivation rec {
-
-  pname = "inav";
-  version = "2.0.0-rc2";
-
-  src = fetchFromGitHub {
-    owner = "iNavFlight";
-    repo = "inav";
-    rev = "a8415e89c2956d133d8175827c079bcf3bc3766c"; # Always use a commit id here!
-    sha256 = "15zai8qf43b06fmws1sbkmdgip51zp7gkfj7pp9b6gi8giarzq3y";
-  };
-
-  nativeBuildInputs = [
-    gcc-arm-embedded binutils-arm-embedded
-    ruby
-  ];
-
-  postPatch = ''
-    sed -ri "s/REVISION.*=.*shell git.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev.
-    sed -ri "s/-j *[0-9]+//" Makefile # Eliminate parallel build args in submakes
-    sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex
-
-    substituteInPlace Makefile \
-      --replace "--specs=nano.specs" ""
-  '';
-
-  enableParallelBuilding = true;
-
-  preBuild = ''
-    buildFlagsArray=(
-      all
-    )
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out
-    cp obj/*.hex $out
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Navigation-enabled flight control software";
-    homepage = "https://inavflight.github.io";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ elitak ];
-    broken = true;
-  };
-
-}
--- a/pkgs/development/interpreters/pure/default.nix
+++ b/pkgs/development/interpreters/pure/default.nix
@ -1,46 +0,0 @@
-{ lib, stdenv, fetchurl, makeWrapper,
-  libllvm, gmp, mpfr, readline, bison, flex }:
-
-stdenv.mkDerivation rec {
-  baseName="pure";
-  version="0.68";
-  name="${baseName}-${version}";
-
-  src = fetchurl {
-    url="https://github.com/agraef/pure-lang/releases/download/${name}/${name}.tar.gz";
-    sha256="0px6x5ivcdbbp2pz5n1r1cwg1syadklhjw8piqhl63n91i4r7iyb";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ bison flex ];
-  propagatedBuildInputs = [ libllvm gmp mpfr readline ];
-  NIX_LDFLAGS = "-lLLVMJIT";
-
-  postPatch = ''
-    for f in expr.cc matcher.cc printer.cc symtable.cc parserdefs.hh; do
-      sed -i '1i\#include <stddef.h>' $f
-    done
-  '';
-
-  configureFlags = [ "--enable-release" ];
-  doCheck = true;
-  checkPhase = ''
-    LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${libllvm}/lib make check
-  '';
-  postInstall = ''
-    wrapProgram $out/bin/pure --prefix LD_LIBRARY_PATH : ${libllvm}/lib
-  '';
-
-  meta = {
-    description = "A modern-style functional programming language based on term rewriting";
-    maintainers = with lib.maintainers;
-    [
-      raskin
-      asppsa
-    ];
-    platforms = with lib.platforms;
-      linux;
-    license = lib.licenses.gpl3Plus;
-    broken = true;
-  };
-}
--- a/pkgs/development/libraries/gdata-sharp/default.nix
+++ b/pkgs/development/libraries/gdata-sharp/default.nix
@ -1,42 +0,0 @@
-{ lib, stdenv, fetchsvn, pkg-config, mono, dotnetPackages }:
-
-let
-  newtonsoft-json = dotnetPackages.NewtonsoftJson;
-in stdenv.mkDerivation {
-  pname = "gdata-sharp";
-  version = "2.2.0.0";
-
-  src = fetchsvn {
-    url = "http://google-gdata.googlecode.com/svn/trunk/";
-    rev = "1217";
-    sha256 = "0b0rvgg3xsbbg2fdrpz0ywsy9rcahlyfskndaagd3yzm83gi6bhk";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ mono newtonsoft-json ];
-
-  sourceRoot = "svn-r1217/clients/cs";
-
-  dontStrip = true;
-
-  postPatch = ''
-    sed -i -e 's#^\(DEFINES=.*\)\(.\)#\1 /r:third_party/Newtonsoft.Json.dll\2#' Makefile
-    #             carriage return ^
-  '';
-
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  meta = with lib; {
-    homepage = "https://code.google.com/archive/p/google-gdata/";
-
-    description = "The Google Data APIs";
-    longDescription = ''
-      The Google Data APIs provide a simple protocol for reading and writing
-      data on the web.
-    '';
-
-    license = licenses.asl20;
-    platforms = platforms.linux;
-    broken = true;
-  };
-}
--- a/pkgs/development/libraries/gnutls-kdh/3.5.nix
+++ b/pkgs/development/libraries/gnutls-kdh/3.5.nix
@ -1,12 +0,0 @@
-{ callPackage, fetchFromGitHub, autoreconfHook, ... } @ args:
-
-callPackage ./generic.nix (args // {
-  version = "1.0";
-
-  src = fetchFromGitHub {
-    owner = "arpa2";
-    repo = "gnutls-kdh";
-    rev = "ff3bb36f70a746f28554641d466e124098dfcb25";
-    sha256 = "1rr3p4r145lnprxn8hqyyzh3qkj3idsbqp08g07ndrhqnxq0k0sw";
-  };
-})
--- a/pkgs/development/libraries/gnutls-kdh/generic.nix
+++ b/pkgs/development/libraries/gnutls-kdh/generic.nix
@ -1,95 +0,0 @@
-{ config, lib, stdenv, zlib, lzo, libtasn1, nettle, pkg-config, lzip
-, perl, gmp, autogen, libidn, p11-kit, unbound, libiconv
-, guileBindings ? config.gnutls.guile or false, guile
-, tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake
-, bison, texinfo
-
-# Version dependent args
-, version, src, patches ? [], postPatch ? "", nativeBuildInputs ? []
-, ...}:
-
-assert guileBindings -> guile != null;
-let
-  # XXX: Gnulib's `test-select' fails on FreeBSD:
-  # https://hydra.nixos.org/build/2962084/nixlog/1/raw .
-  doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4";
-in
-stdenv.mkDerivation {
-  pname = "gnutls-kdh";
-  inherit version;
-
-  inherit src patches;
-
-  outputs = [ "bin" "dev" "out" ];
-
-  patchPhase = ''
-      # rm -fR ./po
-      # substituteInPlace configure "po/Makefile.in" " "
-      substituteInPlace doc/manpages/Makefile.in  --replace "gnutls_cipher_list.3" " "
-      substituteInPlace doc/manpages/Makefile.in  --replace "gnutls_cipher_self_test.3" " "
-      substituteInPlace doc/manpages/Makefile.in  --replace "gnutls_digest_self_test.3" " "
-      substituteInPlace doc/manpages/Makefile.in  --replace "gnutls_mac_self_test.3" " "
-      substituteInPlace doc/manpages/Makefile.in  --replace "gnutls_pk_self_test.3" " "
-      printf "all: ;\n\ninstall: ;" > "po/Makefile.in"
-      printf "all: ;\n\ninstall: ;" > "po/Makefile.in.in"
-      '';
-
-  postPatch = lib.optionalString (lib.versionAtLeast version "3.4") ''
-    sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' \
-      -i tests/cert-tests/name-constraints
-  '' + postPatch;
-
-  preConfigure = "patchShebangs .";
-  configureFlags =
-    lib.optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt"
-  ++ [
-    "--disable-dependency-tracking"
-    "--enable-fast-install"
-  ] ++ lib.optional guileBindings
-    [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ];
-
-  # Build of the Guile bindings is not parallel-safe.  See
-  # <https://github.com/arpa2/gnutls-kdh/commit/330995a920037b6030ec0282b51dde3f8b493cad>
-  # for the actual fix.  Also an apparent race in the generation of
-  # systemkey-args.h.
-  enableParallelBuilding = false;
-
-  buildInputs = [ lzo lzip nettle libtasn1 libidn p11-kit zlib gmp
-  autogen gperftools gperf gettext automake bison texinfo ]
-    ++ lib.optional doCheck nettools
-    ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
-    ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
-    ++ [ unbound ]
-    ++ lib.optional guileBindings guile;
-
-  nativeBuildInputs = [ perl pkg-config ] ++ nativeBuildInputs;
-
-  #inherit doCheck;
-  doCheck = false;
-
-  # Fixup broken libtool and pkg-config files
-  preFixup = lib.optionalString (!stdenv.isDarwin) ''
-    sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \
-        -e 's,-lz,-L${zlib.out}/lib -lz,' \
-        -e 's,-L${gmp.dev}/lib,-L${gmp.out}/lib,' \
-        -e 's,-lgmp,-L${gmp.out}/lib -lgmp,' \
-        -i $out/lib/*.la "$dev/lib/pkgconfig/gnutls.pc"
-  '';
-
-  meta = with lib; {
-    description = "GnuTLS with additional TLS-KDH ciphers: Kerberos + Diffie-Hellman";
-
-    longDescription = ''
-       The ARPA2 project aims to add security. This is an enhanced
-       version of GnuTLS,  a project that aims to develop a library which
-       provides a secure layer, over a reliable transport
-       layer. It adds TLS-KDH ciphers: Kerberos + Diffie-Hellman.
-    '';
-
-    homepage = "https://github.com/arpa2/gnutls-kdh";
-    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ leenaars ];
-    platforms = platforms.all;
-    broken = true;
-  };
-}
--- a/pkgs/development/libraries/gtkmathview/default.nix
+++ b/pkgs/development/libraries/gtkmathview/default.nix
@ -1,29 +0,0 @@
-{lib, stdenv, fetchurl, pkg-config, gtk2, t1lib, glib, libxml2, popt, gmetadom ? null }:
-
-let
-  pname = "gtkmathview";
-  version = "0.8.0";
-in
-
-stdenv.mkDerivation {
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "http://helm.cs.unibo.it/mml-widget/sources/${pname}-${version}.tar.gz";
-    sha256 = "0hwcamf5fi35frg7q6kgisc9v0prqbhsplb2gl55cg3av9sh3hqx";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ t1lib glib gmetadom libxml2 popt];
-  propagatedBuildInputs = [gtk2 t1lib];
-
-  patches = [ ./gcc-4.3-build-fixes.patch ./gcc-4.4-build-fixes.patch ];
-
-  meta = {
-    homepage = "http://helm.cs.unibo.it/mml-widget/";
-    description = "C++ rendering engine for MathML documents";
-    license = lib.licenses.lgpl3Plus;
-    maintainers = [ lib.maintainers.roconnor ];
-    broken = true;
-  };
-}
--- a/pkgs/development/libraries/gtkmathview/gcc-4.3-build-fixes.patch
+++ b/pkgs/development/libraries/gtkmathview/gcc-4.3-build-fixes.patch
@ -1,74 +0,0 @@
-From: Stefano Zacchiroli <zack@upsilon.cc>
-Date: Fri, 11 Dec 2009 12:58:56 +0100
-Subject: [PATCH] gcc 4.3 build fixes
-
---
- mathmlps/main.cc                    |    1 +
- mathmlsvg/SMS.cc                    |    1 +
- mathmlsvg/main.cc                   |    1 +
- src/backend/ps/T1_FontDataBase.cc   |    2 +-
- src/engine/mathml/mathVariantAux.cc |    1 +
- 5 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/mathmlps/main.cc b/mathmlps/main.cc
-index cc6cd1c..48339af 100644
--- a/mathmlps/main.cc
-+++ b/mathmlps/main.cc
-@@ -19,6 +19,7 @@
- #include <config.h>
- 
- #include <cassert>
-+#include <cstring>
- #include <fstream>
- 
- #include <popt.h>
-diff --git a/mathmlsvg/SMS.cc b/mathmlsvg/SMS.cc
-index a76266e..be7add8 100644
--- a/mathmlsvg/SMS.cc
-+++ b/mathmlsvg/SMS.cc
-@@ -18,6 +18,7 @@
- 
- #include <config.h>
- 
-+#include <cstring>
- #include <sstream>
- #include "defs.h"
- #include "AbstractLogger.hh"
-diff --git a/mathmlsvg/main.cc b/mathmlsvg/main.cc
-index 259d67e..c49e8ac 100644
--- a/mathmlsvg/main.cc
-+++ b/mathmlsvg/main.cc
-@@ -19,6 +19,7 @@
- #include <config.h>
- 
- #include <cassert>
-+#include <cstring>
- #include <fstream>
- 
- #include <popt.h>
-diff --git a/src/backend/ps/T1_FontDataBase.cc b/src/backend/ps/T1_FontDataBase.cc
-index b6490eb..3dd436c 100644
--- a/src/backend/ps/T1_FontDataBase.cc
-+++ b/src/backend/ps/T1_FontDataBase.cc
-@@ -19,7 +19,7 @@
- #include <t1lib.h>
- #include <config.h>
- #include <map>
-#include <string>
-+#include <cstring>
- #include <stdlib.h>
- #include <iostream>
- #include <list>
-diff --git a/src/engine/mathml/mathVariantAux.cc b/src/engine/mathml/mathVariantAux.cc
-index 736acc1..dcf1826 100644
--- a/src/engine/mathml/mathVariantAux.cc
-+++ b/src/engine/mathml/mathVariantAux.cc
-@@ -19,6 +19,7 @@
- #include <config.h>
- 
- #include <cassert>
-+#include <cstring>
- 
- #include "mathVariantAux.hh"
- 
-- 
--- a/pkgs/development/libraries/gtkmathview/gcc-4.4-build-fixes.patch
+++ b/pkgs/development/libraries/gtkmathview/gcc-4.4-build-fixes.patch
@ -1,21 +0,0 @@
-From: Stefano Zacchiroli <zack@upsilon.cc>
-Date: Fri, 11 Dec 2009 13:26:26 +0100
-Subject: [PATCH] gcc 4.4 build fixes
-
---
- src/common/AbstractLogger.cc |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/src/common/AbstractLogger.cc b/src/common/AbstractLogger.cc
-index 6f638fb..c5b7e3d 100644
--- a/src/common/AbstractLogger.cc
-+++ b/src/common/AbstractLogger.cc
-@@ -19,6 +19,7 @@
- #include <config.h>
- 
- #include <stdarg.h>
-+#include <stdio.h>
- 
- #include "AbstractLogger.hh"
- 
-- 
--- a/pkgs/development/libraries/ilixi/default.nix
+++ b/pkgs/development/libraries/ilixi/default.nix
@ -1,35 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, directfb, libsigcxx, libxml2, fontconfig }:
-
-# TODO: optional deps: baresip, FusionDale, FusionSound, SaWMan, doxygen,
-# Reflex, Wnn, NLS
-
-stdenv.mkDerivation rec {
-  pname = "ilixi";
-  version = "1.0.0";
-
-  src = fetchFromGitHub {
-    owner = "ilixi";
-    repo = "ilixi";
-    rev = version;
-    sha256 = "05h862r9mhis26v8yf967n86qf8y1gdgfzhbqfsr6pjw1k3v3wdr";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ directfb libsigcxx libxml2 fontconfig ];
-
-  configureFlags = [
-    "--enable-log-debug"
-    "--enable-debug"
-    "--enable-trace"
-    "--with-examples"
-  ];
-
-  meta = with lib; {
-    description = "Lightweight C++ GUI toolkit for embedded Linux systems";
-    homepage = "https://github.com/ilixi/ilixi";
-    license = licenses.lgpl3;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
-    broken = true; # broken by the directfb 1.6.3 -> 1.7.6 update
-  };
-}
--- a/pkgs/development/libraries/qxt/default.nix
+++ b/pkgs/development/libraries/qxt/default.nix
@ -1,34 +0,0 @@
-{ lib, stdenv, which, coreutils, fetchzip, qt4 }:
-
-stdenv.mkDerivation rec {
-  pname = "qxt";
-  version = "0.6.2";
-
-  src = fetchzip {
-    url = "https://bitbucket.org/libqxt/libqxt/get/v${version}.tar.gz";
-    sha256 = "0zmqfn0h8cpky7wgaaxlfh0l89r9r0isi87587kaicyap7a6kxwz";
-  };
-
-  buildInputs = [ qt4 which ];
-
-  patchPhase = ''
-    patchShebangs configure
-    substituteInPlace configure --replace "/bin/pwd" "${coreutils}/bin/pwd"
-  '';
-
-  prefixKey = "-prefix ";
-
-  meta = {
-    homepage = "http://libqxt.org";
-    description = "An extension library for Qt";
-    longDescription = ''
-      An extension library for Qt providing a suite of cross-platform utility
-      classes to add functionality not readily available in the Qt toolkit by Qt
-      Development Frameworks, Nokia.
-    '';
-    license = lib.licenses.gpl2;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ forkk ];
-    broken = true;
-  };
-}
--- a/pkgs/development/pure-modules/audio/default.nix
+++ b/pkgs/development/pure-modules/audio/default.nix
@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure, portaudio, fftw, libsndfile, libsamplerate }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-audio";
-  version = "0.6";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-audio-${version}.tar.gz";
-    sha256 = "c1f2a5da73983efb5a54f86d57ba93713ebed20ff0c72de9b3467f10f2904ee0";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure portaudio fftw libsndfile libsamplerate ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "A digital audio interface for the Pure programming language";
-    homepage = "http://puredocs.bitbucket.org/pure-audio.html";
-    license = lib.licenses.bsd3;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/avahi/default.nix
+++ b/pkgs/development/pure-modules/avahi/default.nix
@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure, avahi }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-avahi";
-  version = "0.3";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-avahi-${version}.tar.gz";
-    sha256 = "5fac8a6e3a54e45648ceb207ee0061b22eac8c4e668b8d53f13eb338b09c9160";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure avahi ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "A digital audio interface for the Pure programming language";
-    homepage = "http://puredocs.bitbucket.org/pure-avahi.html";
-    license = lib.licenses.lgpl3Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/csv/default.nix
+++ b/pkgs/development/pure-modules/csv/default.nix
@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-csv";
-  version = "1.6";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-csv-${version}.tar.gz";
-    sha256 = "fe7c4edebe8208c54d5792a9eefaeb28c4a58b9094d161a6dda8126f0823ab3c";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "Comma Separated Value Interface for the Pure Programming Language";
-    homepage = "http://puredocs.bitbucket.org/pure-csv.html";
-    license = lib.licenses.free;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/doc/default.nix
+++ b/pkgs/development/pure-modules/doc/default.nix
@ -1,23 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-doc";
-  version = "0.7";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-doc-${version}.tar.gz";
-    sha256 = "cfa880573941f37868269bcc443a09fecd2a141a78556383d2213f6c9f45ddd9";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ pure ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-
-  meta = {
-    description = "A simple utility for literate programming and documenting source code written in the Pure programming language";
-    homepage = "http://puredocs.bitbucket.org/pure-doc.html";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/fastcgi/default.nix
+++ b/pkgs/development/pure-modules/fastcgi/default.nix
@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure, fcgi }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-fastcgi";
-  version = "0.6";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-fastcgi-${version}.tar.gz";
-    sha256 = "aa5789cc1e17521c01f349ee82ce2a00500e025b3f8494f89a7ebe165b5aabc7";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure fcgi ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "Lets you write FastCGI scripts with Pure, to be run by web servers like Apache";
-    homepage = "http://puredocs.bitbucket.org/pure-fastcgi.html";
-    license = lib.licenses.bsd3;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/faust/default.nix
+++ b/pkgs/development/pure-modules/faust/default.nix
@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure, faust, libtool }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-faust";
-  version = "0.11";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-faust-${version}.tar.gz";
-    sha256 = "51278a3b0807c4770163dc2ce423507dcf0ffec9cd1c1fbc08426d07294f6ae0";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure faust libtool ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "Lets you load and run Faust-generated signal processing modules in Pure";
-    homepage = "http://puredocs.bitbucket.org/pure-faust.html";
-    license = lib.licenses.lgpl3Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/ffi/default.nix
+++ b/pkgs/development/pure-modules/ffi/default.nix
@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure, libffi }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-ffi";
-  version = "0.14";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-ffi-${version}.tar.gz";
-    sha256 = "0331f48efaae40af21b23cf286fd7eac0ea0a249d08fd97bf23246929c0ea71a";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure libffi ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "Provides an interface to libffi which enables you to call C functions from Pure and vice versa";
-    homepage = "http://puredocs.bitbucket.org/pure-ffi.html";
-    license = lib.licenses.lgpl3Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/gen/default.nix
+++ b/pkgs/development/pure-modules/gen/default.nix
@ -1,26 +0,0 @@
-{ lib, stdenv, fetchurl,
-  pkg-config, pure, haskellPackages }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-gen";
-  version = "0.20";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-gen-${version}.tar.gz";
-    sha256 = "cfadd99a378b296325937d2492347611cc1e1d9f24594f91f3c2293eca01a4a8";
-  };
-
-  hsEnv = haskellPackages.ghcWithPackages (hsPkgs : [hsPkgs.language-c]);
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ hsEnv pure ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-
-  meta = {
-    description = "Pure interface generator";
-    homepage = "http://puredocs.bitbucket.org/pure-gen.html";
-    license = lib.licenses.free;
-    platforms = lib.platforms.linux;
-    hydraPlatforms = [];
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/generic-setup-hook.sh
+++ b/pkgs/development/pure-modules/generic-setup-hook.sh
@ -1,2 +0,0 @@
-addToSearchPath PURE_INCLUDE $1/lib/pure
-addToSearchPath PURE_LIBRARY $1/lib/pure
--- a/pkgs/development/pure-modules/gl/default.nix
+++ b/pkgs/development/pure-modules/gl/default.nix
@ -1,27 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure, freeglut, libGLU, libGL, xlibsWrapper }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-gl";
-  version = "0.9";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-gl-${version}.tar.gz";
-    sha256 = "edd594222f89ae372067eda6679a37488986b9739b5b79b4a25ac48255d31bba";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure freeglut libGLU libGL xlibsWrapper ];
-  makeFlags = [
-    "libdir=${placeholder "out"}/lib"
-    "prefix=${placeholder "out"}/"
-  ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "Fairly complete Pure bindings for the OpenGL graphics library, which allow you to do 2D and 3D graphics programming with Pure";
-    homepage = "http://puredocs.bitbucket.org/pure-gl.html";
-    license = lib.licenses.bsd3;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/glpk/default.nix
+++ b/pkgs/development/pure-modules/glpk/default.nix
@ -1,40 +0,0 @@
-{ lib, stdenv, fetchurl,
-  pkg-config, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-glpk";
-  version = "0.5";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-glpk-${version}.tar.gz";
-    sha256 = "5d6dc11706985dda02d96d481ea5f164c9e95ee446432fc4fc3d0db61a076346";
-  };
-
-  glpkWithExtras = lib.overrideDerivation glpk (attrs: {
-    propagatedBuildInputs = [ gmp libtool libmysqlclient libiodbc ];
-
-    CPPFLAGS = "-I${gmp.dev}/include";
-
-    preConfigure = ''
-      substituteInPlace configure \
-        --replace /usr/include/mysql ${libmysqlclient}/include/mysql
-    '';
-    configureFlags = [ "--enable-dl"
-                       "--enable-odbc"
-                       "--enable-mysql"
-                       "--with-gmp=yes" ];
-  });
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure glpkWithExtras ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "GLPK interface for the Pure Programming Language";
-    homepage = "http://puredocs.bitbucket.org/pure-glpk.html";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/gplot/default.nix
+++ b/pkgs/development/pure-modules/gplot/default.nix
@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure, gnuplot }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-gplot";
-  version = "0.1";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-gplot-${version}.tar.gz";
-    sha256 = "841ded98e4d1cdfaf78f95481e5995d0440bfda2d5df533d6741a6e7058a882c";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure gnuplot ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "A pure binding to gnuplot";
-    homepage = "http://puredocs.bitbucket.org/pure-gplot.html";
-    license = lib.licenses.lgpl3Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/gsl/default.nix
+++ b/pkgs/development/pure-modules/gsl/default.nix
@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pure, pkg-config, gsl }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-gsl";
-  version = "0.12";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-gsl-${version}.tar.gz";
-    sha256 = "06bdd873d5417d90ca35093056a060b77365123ed24c3ac583cd3922d4c78a75";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure gsl ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "GNU Scientific Library interface for Pure";
-    homepage = "http://puredocs.bitbucket.org/pure-gsl.html";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/gtk/default.nix
+++ b/pkgs/development/pure-modules/gtk/default.nix
@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure, pure-ffi, gtk2 }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-gtk";
-  version = "0.13";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-gtk-${version}.tar.gz";
-    sha256 = "e659ff1bc5809ce35b810f8ac3fb7e8cadaaef13996537d8632e2f86ed76d203";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure pure-ffi gtk2 ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "A collection of bindings to use the GTK GUI toolkit version 2.x with Pure";
-    homepage = "http://puredocs.bitbucket.org/pure-gtk.html";
-    license = lib.licenses.lgpl3Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/liblo/default.nix
+++ b/pkgs/development/pure-modules/liblo/default.nix
@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure, liblo }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-liblo";
-  version = "0.9";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-liblo-${version}.tar.gz";
-    sha256 = "c2ba4d6f94489acf8a8fac73982ae03d5ad4113146eb1f7d6558a956c57cb8ee";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure liblo ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "A quick and dirty Pure wrapper for the liblo library, which implements Berkeley’s Open Sound Control (OSC) protocol";
-    homepage = "http://puredocs.bitbucket.org/pure-liblo.html";
-    license = lib.licenses.lgpl3Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/lilv/default.nix
+++ b/pkgs/development/pure-modules/lilv/default.nix
@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure, lilv, lv2, serd, sord, sratom }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-lilv";
-  version = "0.4";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-lilv-${version}.tar.gz";
-    sha256 = "af20982fe43e8dce62d50bf7a78e461ab36c308325b123cddbababf0d3beaf9f";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure lilv lv2 serd sord sratom ];
-  makeFlags = [ "CFLAGS=-I${lilv}/include/lilv-0" "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "A Pure module for David Robillard’s Lilv, a library for LV2 plugin host writers";
-    homepage = "http://puredocs.bitbucket.org/pure-lilv.html";
-    license = lib.licenses.bsd3;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/lv2/default.nix
+++ b/pkgs/development/pure-modules/lv2/default.nix
@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure, lv2 }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-lv2";
-  version = "0.2";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-lv2-${version}.tar.gz";
-    sha256 = "721cacd831781d8309e7ecabb0ee7c01da17e75c5642a5627cf158bfb36093e1";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure lv2 ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "A generic LV2 plugin wrapper for Pure which can be linked with batch-compiled Pure scripts to obtain LV2 plugin modules";
-    homepage = "http://puredocs.bitbucket.org/pure-lv2.html";
-    license = lib.licenses.bsd3;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/midi/default.nix
+++ b/pkgs/development/pure-modules/midi/default.nix
@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure, portmidi }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-midi";
-  version = "0.6";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-midi-${version}.tar.gz";
-    sha256 = "817ae9fa5f443a8c478a6770f36091e3cf99f3515c74e00d09ca958dead1e7eb";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure portmidi ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "A MIDI interface for the Pure programming language";
-    homepage = "http://puredocs.bitbucket.org/pure-midi.html";
-    license = lib.licenses.bsd3;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/mpfr/default.nix
+++ b/pkgs/development/pure-modules/mpfr/default.nix
@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-mpfr";
-  version = "0.5";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-mpfr-${version}.tar.gz";
-    sha256 = "39d2255c2c0c2d60ce727be178b5e5a06f7c92eb365976c49c4a34b1edc576e7";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "This module makes the MPFR multiprecision floats available in Pure";
-    homepage = "http://puredocs.bitbucket.org/pure-mpfr.html";
-    license = lib.licenses.lgpl3Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/octave/default.nix
+++ b/pkgs/development/pure-modules/octave/default.nix
@ -1,26 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure, octave }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-octave";
-  version = "0.9";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-octave-${version}.tar.gz";
-    sha256 = "0l1mvmi3rpabzjcrk6p04rdn922mvdm9x67zby3dha5iiccc47q0";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure octave ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "An Octave module for the Pure programming language";
-    homepage = "http://puredocs.bitbucket.org/pure-octave.html";
-    license = lib.licenses.gpl3Plus;
-    # This is set to none for now because it does not work with the
-    # current stable version of Octave.
-    platforms = lib.platforms.none;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/odbc/default.nix
+++ b/pkgs/development/pure-modules/odbc/default.nix
@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure, libiodbc }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-odbc";
-  version = "0.10";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-odbc-${version}.tar.gz";
-    sha256 = "1907e9ebca11cc68762cf7046084b31e9e2bf056df85c40ccbcbe9f02221ff8d";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure libiodbc ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "A simple ODBC interface for the Pure programming language";
-    homepage = "http://puredocs.bitbucket.org/pure-odbc.html";
-    license = lib.licenses.lgpl3Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/pandoc/default.nix
+++ b/pkgs/development/pure-modules/pandoc/default.nix
@ -1,28 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure, pandoc, gawk, getopt }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-pandoc";
-  version = "0.1";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-pandoc-${version}.tar.gz";
-    sha256 = "0f23a17549048ca3a8f4936ea9e931feb05997390b486850936b746996350cda";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ pure ];
-  propagatedBuildInputs = [ pandoc gawk getopt ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  preInstall = ''
-    mkdir -p $out/bin
-    mkdir -p $out/share/man/man1
-  '';
-
-  meta = {
-    description = "Converts Sphinx-formatted Pure documentation files to Markdown and other formats using Pandoc";
-    homepage = "http://puredocs.bitbucket.org/pure-pandoc.html";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/rational/default.nix
+++ b/pkgs/development/pure-modules/rational/default.nix
@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-rational";
-  version = "0.1";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-rational-${version}.tar.gz";
-    sha256 = "62cb4079a0dadd232a859e577e97e50e9718ccfcc5983c4d9c4c32cac7a9bafa";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "A collection of utility functions for rational numbers, and a module for doing interval arithmetic in Pure";
-    homepage = "http://puredocs.bitbucket.org/pure-rational.html";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/readline/default.nix
+++ b/pkgs/development/pure-modules/readline/default.nix
@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure, readline }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-readline";
-  version = "0.3";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-readline-${version}.tar.gz";
-    sha256 = "db8e6663b1c085466c09662fe86d952b6f4ffdafeecffe805c681ab91c910886";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure readline ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "A trivial wrapper around GNU readline, which gives Pure scripts access to the most important facilities of the readline interface";
-    homepage = "http://puredocs.bitbucket.org/pure-readline.html";
-    license = lib.licenses.free;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/sockets/default.nix
+++ b/pkgs/development/pure-modules/sockets/default.nix
@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-sockets";
-  version = "0.7";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-sockets-${version}.tar.gz";
-    sha256 = "4f2769618ae5818cf6005bb08bcf02fe359a2e31998d12dc0c72f0494e9c0420";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "A Pure interface to the Berkeley socket functions";
-    homepage = "http://puredocs.bitbucket.org/pure-sockets.html";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/sql3/default.nix
+++ b/pkgs/development/pure-modules/sql3/default.nix
@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure, sqlite }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-sql3";
-  version = "0.5";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-sql3-${version}.tar.gz";
-    sha256 = "b9f79dd443c8ffc5cede51e2af617f24726f5c0409aab4948c9847e6adb53c37";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure sqlite ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "A SQLite module for the Pure programming language";
-    homepage = "http://puredocs.bitbucket.org/pure-sql3.html";
-    license = lib.licenses.bsd3;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/stldict/default.nix
+++ b/pkgs/development/pure-modules/stldict/default.nix
@ -1,30 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-stldict";
-  version = "0.8";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-stldict-${version}.tar.gz";
-    sha256 = "5b894ae6dc574c7022258e2732bea649c82c959ec4d0be13fb5a3e8ba8488f28";
-  };
-
-  postPatch = ''
-    for f in hashdict.cc orddict.cc; do
-      sed -i '1i\#include <stddef.h>' $f
-    done
-  '';
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "A Pure interface to the C++ dictionary containers map and unordered_map";
-    homepage = "http://puredocs.bitbucket.org/pure-stldict.html";
-    license = lib.licenses.lgpl3Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/stllib/default.nix
+++ b/pkgs/development/pure-modules/stllib/default.nix
@ -1,30 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-stllib";
-  version = "0.6";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-stllib-${version}.tar.gz";
-    sha256 = "1d550764fc2f8ba6ddbd1fbd3da2d6965b69e2c992747265d9ebe4f16aa5e455";
-  };
-
-  postPatch = ''
-    for f in pure-stlmap/{stlmap.cpp,stlmmap.cpp,stlhmap.cpp}; do
-      sed -i '1i\#include <cstddef>' $f
-    done
-  '';
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "An “umbrella” package that contains a pair of Pure addons, pure-stlvec and pure-stlmap";
-    homepage = "http://puredocs.bitbucket.org/pure-stllib.html";
-    license = lib.licenses.bsd3;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/tk/default.nix
+++ b/pkgs/development/pure-modules/tk/default.nix
@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure, tcl, tk, xlibsWrapper }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-tk";
-  version = "0.5";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-tk-${version}.tar.gz";
-    sha256 = "3b6e97e2d723d5a05bf25f4ac62068ac17a1fd81db03e1986366097bf071a516";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure tcl tk xlibsWrapper ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "A basic interface between Pure and Tcl/Tk";
-    homepage = "http://puredocs.bitbucket.org/pure-tk.html";
-    license = lib.licenses.bsd3;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/pure-modules/xml/default.nix
+++ b/pkgs/development/pure-modules/xml/default.nix
@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, pure, libxml2, libxslt }:
-
-stdenv.mkDerivation rec {
-  pname = "pure-xml";
-  version = "0.7";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-xml-${version}.tar.gz";
-    sha256 = "e862dec060917a285bc3befc90f4eb70b6cc33136fb524ad3aa173714a35b0f7";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ pure libxml2 libxslt ];
-  makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
-  setupHook = ../generic-setup-hook.sh;
-
-  meta = {
-    description = "A simplified interface to the Gnome libxml2 and libxslt libraries for Pure";
-    homepage = "http://puredocs.bitbucket.org/pure-xml.html";
-    license = lib.licenses.lgpl3Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ asppsa ];
-  };
-}
--- a/pkgs/development/tools/imatix_gsl/default.nix
+++ b/pkgs/development/tools/imatix_gsl/default.nix
@ -1,30 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, pcre } :
-
-stdenv.mkDerivation {
-  pname = "imatix_gsl";
-  version = "4.1";
-
-  src = fetchFromGitHub {
-    owner = "imatix";
-    repo = "gsl";
-    rev = "72192d0d9de17de08d9379602d6482b4e5d402d0";
-    sha256 = "1apy11avgqc27xlczyjh15y10qjdyqsqab1wrl2067qgpdiy58w7";
-  };
-
-  buildInputs = [ pcre ];
-
-  CCNAME = "cc";
-
-  postPatch = "sed -e 's,/usr/bin/install,install,g' -i src/Makefile";
-  preBuild = "cd src";
-  installFlags = [ "DESTDIR=$(out)" ];
-
-  meta = with lib; {
-    license = licenses.gpl3Plus;
-    homepage = "https://github.com/imatix/gsl/";
-    description = "A universal code generator";
-    platforms = platforms.unix;
-    maintainers = [ maintainers.moosingin3space ];
-    broken = stdenv.isLinux; # 2018-04-10
-  };
-}
--- a/pkgs/misc/logging/beats/6.x.nix
+++ b/pkgs/misc/logging/beats/6.x.nix
@ -41,20 +41,6 @@ in rec {
        elk = nixosTests.elk.ELK-6;
      };
  };
-  packetbeat6 = beat "packetbeat" {
-    buildInputs = [ libpcap ];
-    meta.broken = true;
-    meta.description = "Network packet analyzer that ships data to Elasticsearch";
-    meta.longDescription = ''
-      Packetbeat is an open source network packet analyzer that ships the
-      data to Elasticsearch.
-
-      Think of it like a distributed real-time Wireshark with a lot more
-      analytics features. The Packetbeat shippers sniff the traffic between
-      your application processes, parse on the fly protocols like HTTP, MySQL,
-      PostgreSQL, Redis or Thrift and correlate the messages into transactions.
-    '';
-  };
  journalbeat6  = beat "journalbeat" {
    meta.description = ''
      Journalbeat is an open source data collector to read and forward
--- a/pkgs/servers/http/myserver/default.nix
+++ b/pkgs/servers/http/myserver/default.nix
@ -1,53 +0,0 @@
-{ lib, fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls
-, libxml2, zlib, guile, texinfo, cppunit, killall }:
-
-let version = "0.11"; in
-
-stdenv.mkDerivation rec {
-  pname = "myserver";
-  inherit version;
-
-  src = fetchurl {
-    url = "mirror://gnu/myserver/${version}/${pname}-${version}.tar.xz";
-    sha256 = "02y3vv4hxpy5h710y79s8ipzshhc370gbz1wm85x0lnq5nqxj2ax";
-  };
-
-  patches =
-    [ ./disable-dns-lookup-in-chroot.patch ];
-
-  buildInputs = [
-    libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo
-  ];
-
-  checkInputs = [ cppunit ];
-
-  makeFlags = [ "V=1" ];
-
-  doCheck = true;
-
-  enableParallelBuilding = true;
-
-  # On GNU/Linux the `test_suite' process sometimes stays around, so
-  # forcefully terminate it.
-  postCheck = "${killall}/bin/killall test_suite || true";
-
-  meta = {
-    description = "GNU MyServer, a powerful and easy to configure web server";
-
-    longDescription = ''
-      GNU MyServer is a powerful and easy to configure web server.  Its
-      multi-threaded architecture makes it extremely scalable and usable in
-      large scale sites as well as in small networks, it has a lot of
-      built-in features.  Share your files in minutes!
-    '';
-
-    homepage = "https://www.gnu.org/software/myserver/";
-
-    license = lib.licenses.gpl3Plus;
-
-    # libevent fails to build on Cygwin and Guile has troubles on Darwin.
-    platforms = lib.platforms.gnu ++ lib.platforms.linux;
-
-    broken = true; # needs patch for gets()
-  };
-}
--- a/pkgs/servers/http/myserver/disable-dns-lookup-in-chroot.patch
+++ b/pkgs/servers/http/myserver/disable-dns-lookup-in-chroot.patch
@ -1,12 +0,0 @@
-Disable this test because it attempts to do a DNS lookup, which fails
-in a chroot.
-
--- myserver-0.10/tests/test_socket.cpp	2010-10-19 00:12:59.000000000 +0200
-+++ myserver-0.10/tests/test_socket.cpp	2010-10-19 00:13:07.000000000 +0200
-@@ -56,7 +56,6 @@ class TestSocket : public CppUnit::TestF
- 
-   CPPUNIT_TEST (testGethostname);
-   CPPUNIT_TEST (testRecv);
-  CPPUNIT_TEST (testGetLocalIPsList);
- 
-   CPPUNIT_TEST_SUITE_END ();
--- a/pkgs/servers/openxpki/default.nix
+++ b/pkgs/servers/openxpki/default.nix
@ -1,83 +0,0 @@
-{ lib, fetchgit, perl, openssl, perlPackages, gettext, python3Packages
-# TODO: Remove extra dependencies once it is clear that they are NOT needed somewhere.
-, extraDependencies1 ? false, extraDependencies2 ? false, extraDependencies3 ? false }:
-
-perlPackages.buildPerlPackage {
-  pname = "openxpki";
-  version = "git20150807";
-
-  src = fetchgit {
-    url = "https://github.com/openxpki/openxpki";
-    rev = "5cb76c553b6b1a81ede380857700628a7521f6e3";
-    sha256 = "05bmhani2c7ays488xv3hx5xbxb612bnwq5rdjwmsj51xpaz454p";
-  };
-
-  buildInputs = [ perl openssl gettext python3Packages.sphinx ];
-  propagatedBuildInputs = with perlPackages;
-    [ # dependencies from Makefile.PL
-      libintl-perl ConfigVersioned LWP ClassAccessorChained IOSocketSSL ClassStd
-      CGISession ConfigStd ConfigMerge Connector CryptCBC CryptOpenSSLAES CryptPKCS10
-      DBDMock DataPassword DataSerializer DateTimeFormatDateParse IOPrompt
-      IPCShareLite JSON LogLog4perl LWPProtocolConnect LWPProtocolHttps MailRFC822Address
-      Moose NetAddrIP NetDNS NetIP perlldap NetHTTP NetServer NetSSLeay ParamsValidate PathClass
-      ProcProcessTable ProcSafeExec RegexpCommon SOAPLite Switch SysSigAction TemplateToolkit
-      TestPod TestPodCoverage TextCSV_XS Workflow XMLFilterXInclude XMLParser
-      XMLSAX XMLSAXWriter XMLSimple XMLValidatorSchema ]
-    ++ lib.optionals extraDependencies1
-    [ # dependencies from parsing through core/server
-      ClassAccessor PathTools DataDumper DateTime DateTimeFormatStrptime DBI
-      Encode ExceptionClass FilePath FileTemp Filter GetoptLong HTMLParser
-      ScalarListUtils MathBigInt Memoize libnet RTClientREST
-      Storable ]
-    ++ lib.optionals extraDependencies2
-    [ # dependencies taken from Debian
-      MooseXTypesPathClass DataStreamBulk MooseXStrictConstructor GitPurePerl
-      ConfigGitLike DevelStackTrace TreeDAGNode ClassObservable ClassFactory TimeDate ConfigAny
-      CGIFast ClassISA YAML YAMLLibYAML AuthenSASL TextCSV FileFindRulePerl IODigest ]
-    ++ lib.optionals extraDependencies3
-    [ # dependencies taken from https://metacpan.org/pod/release/ALECH/Bundle-OpenXPKI-0.06/lib/Bundle/OpenXPKI.pm
-      AttributeParamsValidate BC CGI CPAN CacheCache ClassClassgenclassgen
-      ClassContainer ClassDataInheritable ClassSingleton ConvertASN1 DBDSQLite DBIxHTMLViewLATEST
-      DBFile DataPage DataSpreadPagination DateTimeLocale DateTimeTimeZone DevelPPPort
-      DevelSymdump DigestSHA1 Env Error ExtUtilsConstant ExtUtilsInstall
-      ExtUtilsMakeMaker FileCheckTree GoferTransporthttp HTMLMason HTMLTagset
-      HTTPServerSimpleMason IO IPCSysV LocaleCodes LogDispatch MathBigRat
-      MathRound ModuleBuild ModuleBuildDeprecated NetPing PodChecker
-      PodCoverage PodLaTeX PodParser PodPerldoc PodPlainer PodSimple
-      SubUplevel SysSyslog TemplatePluginAutoformat TermReadKey TestException
-      TestHTTPServerSimple TestHarnessStraps TextBalanced TextIconv TextSoundex
-      ThreadQueue TieFile TieRefHash TimeLocal URI
-      UnicodeNormalize WWWMechanize Want XMLFilterBufferText XMLNamespaceSupport bignum
-      libapreq2 libnet podlators threadsshared version ];
-
-  preConfigure = ''
-    substituteInPlace core/server/Makefile.PL \
-      --replace "my \$openssl_inc_dir = ''';" "my \$openssl_inc_dir = '${openssl.dev}/include';" \
-      --replace "my \$openssl_lib_dir = ''';" "my \$openssl_lib_dir = '${lib.getLib openssl}/lib';" \
-      --replace "my \$openssl_binary  = ''';" "my \$openssl_binary  = '${openssl.bin}/bin/openssl';"
-    substituteInPlace tools/vergen --replace "#!/usr/bin/perl" "#!${perl}/bin/perl"
-    cp ${./vergen_revision_state} .vergen_revision_state
-    cd core/server
-    '';
-
-  postInstall = ''
-    mkdir -p $out/share/openxpki
-    cp -r ../htdocs_source $out/share/openxpki/.
-    cp -r ../../config $out/share/openxpki/.
-    cp -r ../../qatest $out/share/openxpki/.
-    (cd ../i18n; make scan; make; make install PREFIX=$out)
-    (cd ../../clients/perl/OpenXPKI-Client-Enrollment; perl Makefile.PL PREFIX=$out; make; make install PREFIX=$out)
-    (cd ../../doc; make html man; cp _build/man/* $out/share/man/man1/.; mkdir -p $out/share/openxpki/doc; cp -r _build/{html,doctrees} $out/share/openxpki/doc/.)
-    '';
-
-  doCheck = false;
-
-  meta = {
-    homepage = "http://www.openxpki.org";
-    description = "Enterprise-grade PKI/Trustcenter software";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ tstrobel ];
-    platforms = with lib.platforms; linux;
-    broken = true;  # broken with openssl 1.1 (v2.x might fix this)
-  };
-}
--- a/pkgs/servers/openxpki/vergen_revision_state
+++ b/pkgs/servers/openxpki/vergen_revision_state
@ -1,12 +0,0 @@
-$revision_info = {
-                   'git-tag' => 'v0.33.0',
-                   'git-tags' => 'v0.33.0',
-                   'git-branch' => 'master',
-                   'git-description-root' => undef,
-                   'git-description' => 'v0.33.0',
-                   'revision' => '1591',
-                   'last-changed-revision' => '1591',
-                   'git-abbreviated-commit-hash' => '5cb76c5',
-                   'git-commit-hash' => '5cb76c553b6b1a81ede380857700628a7521f6e3',
-                   'git-commit-date' => 'Tue, 4 Aug 2015 12:47:29 +0200'
-                 };
--- a/pkgs/servers/xmpp/openfire/default.nix
+++ b/pkgs/servers/xmpp/openfire/default.nix
@ -1,31 +0,0 @@
-{ lib, stdenv, fetchurl, jre }:
-
-stdenv.mkDerivation rec {
-  pname = "openfire";
-  version  = "3_6_3";
-
-  src = fetchurl {
-    url = "http://www.igniterealtime.org/downloadServlet?filename=openfire/openfire_${version}.tar.gz";
-    sha256 = "0ibzhmh9qw4lmx45ir1i280p30npgwnj7vrkl432kj3zi7hp79q2";
-  };
-
-  buildInputs = [ jre ];
-
-  installPhase = ''
-    sed -e 's@\(common_jvm_locations=\).*@\1${jre}@' -i bin/openfire
-    cp -r . $out
-    rm -r $out/logs
-    mv $out/conf $out/conf.inst
-    ln -s /var/log/openfire $out/logs
-    ln -s /etc/openfire $out/conf
-  '';
-
-  meta = {
-    description = "XMPP server in Java";
-    platforms = lib.platforms.unix;
-    # Some security advisories seem to apply, and each next version wants to
-    # write into larger parts of installation directory; installation is just
-    # unpacking, though
-    broken = true;
-  };
-}
--- a/pkgs/tools/backup/bareos/default.nix
+++ b/pkgs/tools/backup/bareos/default.nix
@ -1,82 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, nettools, gettext, flex
-, readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb
-, sqlite ? null, postgresql ? null, libmysqlclient ? null, zlib ? null, lzo ? null
-, jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null
-}:
-
-assert sqlite != null || postgresql != null || libmysqlclient != null;
-
-with lib;
-let
-  withGlusterfs = "\${with_glusterfs_directory}";
-in
-stdenv.mkDerivation rec {
-  pname = "bareos";
-  version = "17.2.7";
-
-  src = fetchFromGitHub {
-    owner = "bareos";
-    repo = "bareos";
-    rev = "Release/${version}";
-    name = "${pname}-${version}-src";
-    sha256 = "1awf5i4mw2nfd7z0dmqnywapnx9nz6xwqv8rxp0y2mnrhzdpbrbz";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    nettools gettext readline openssl python2 flex ncurses sqlite postgresql
-    libmysqlclient zlib lzo jansson acl glusterfs libceph libcap rocksdb
-  ];
-
-  postPatch = ''
-    sed -i 's,\(-I${withGlusterfs}/include\),\1/glusterfs,' configure
-  '';
-
-  configureFlags = [
-    "--sysconfdir=/etc"
-    "--exec-prefix=\${out}"
-    "--enable-lockmgr"
-    "--enable-dynamic-storage-backends"
-    "--with-basename=nixos" # For reproducible builds since it uses the hostname otherwise
-    "--with-hostname=nixos" # For reproducible builds since it uses the hostname otherwise
-    "--with-working-dir=/var/lib/bareos"
-    "--with-bsrdir=/var/lib/bareos"
-    "--with-logdir=/var/log/bareos"
-    "--with-pid-dir=/run/bareos"
-    "--with-subsys-dir=/run/bareos"
-    "--enable-ndmp"
-    "--enable-lmdb"
-    "--enable-batch-insert"
-    "--enable-dynamic-cats-backends"
-    "--enable-sql-pooling"
-    "--enable-scsi-crypto"
-  ] ++ optionals (readline != null) [ "--disable-conio" "--enable-readline" "--with-readline=${readline.dev}" ]
-    ++ optional (python2 != null) "--with-python=${python2}"
-    ++ optional (openssl != null) "--with-openssl=${openssl.dev}"
-    ++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}"
-    ++ optional (postgresql != null) "--with-postgresql=${postgresql}"
-    ++ optional (libmysqlclient != null) "--with-mysql=${libmysqlclient}"
-    ++ optional (zlib != null) "--with-zlib=${zlib.dev}"
-    ++ optional (lzo != null) "--with-lzo=${lzo}"
-    ++ optional (jansson != null) "--with-jansson=${jansson}"
-    ++ optional (acl != null) "--enable-acl"
-    ++ optional (glusterfs != null) "--with-glusterfs=${glusterfs}"
-    ++ optional (libceph != null) "--with-cephfs=${libceph}";
-
-  installFlags = [
-    "sysconfdir=\${out}/etc"
-    "confdir=\${out}/etc/bareos"
-    "scriptdir=\${out}/etc/bareos"
-    "working_dir=\${TMPDIR}"
-    "log_dir=\${TMPDIR}"
-    "sbindir=\${out}/bin"
-  ];
-
-  meta = with lib; {
-    homepage = "http://www.bareos.org/";
-    description = "A fork of the bacula project";
-    license = licenses.agpl3;
-    platforms = platforms.unix;
-    broken = true;
-  };
-}
--- a/pkgs/tools/backup/ori/default.nix
+++ b/pkgs/tools/backup/ori/default.nix
@ -1,29 +0,0 @@
-{ lib, stdenv, fetchurl, boost, pkg-config, scons, util-linux, fuse, libevent, openssl, zlib }:
-
-stdenv.mkDerivation {
-  version = "0.8.1";
-  pname = "ori";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/orifs/ori/downloads/ori-0.8.1.tar.xz";
-    sha256 = "8ce1a3dfbb6d1538885e993616bdfe71be44711d48f7f6798ff6bc0a39b3deca";
-  };
-
-  buildInputs = [
-    boost pkg-config scons util-linux fuse libevent openssl zlib
-  ];
-
-  buildPhase = ''
-    scons PREFIX=$out WITH_ORILOCAL=1 install
-  '';
-
-  dontInstall = true;
-
-  meta = with lib; {
-    description = "A secure distributed file system";
-    homepage = "http://ori.scs.stanford.edu/";
-    license = licenses.mit;
-    platforms = platforms.unix;
-    broken = true; # 2018-04-11
-  };
-}
--- a/pkgs/tools/misc/bonfire/default.nix
+++ b/pkgs/tools/misc/bonfire/default.nix
@ -1,49 +0,0 @@
-{ lib, python3Packages, fetchFromGitHub }:
-
-with python3Packages;
-
-buildPythonApplication rec {
-  pname = "bonfire";
-  version = "unstable-2017-01-19";
-
-  # use latest git version with --endpoint flag
-  # https://github.com/blue-yonder/bonfire/pull/18
-  src = fetchFromGitHub {
-    owner = "blue-yonder";
-    repo = pname;
-    rev = "d0af9ca10394f366cfa3c60f0741f1f0918011c2";
-    sha256 = "193zcvzbhxwwkwbgmnlihhhazwkajycxf4r71jz1m12w301sjhq5";
-  };
-
-  postPatch = ''
-    # https://github.com/blue-yonder/bonfire/pull/24
-    substituteInPlace requirements.txt \
-      --replace "arrow>=0.5.4,<0.8" "arrow>=0.5.4" \
-      --replace "keyring>=9,<10"    "keyring>=9" \
-      --replace "click>=3.3,<7"     "click>=3.3"
-    # pip fails when encountering the git hash for the package version
-    substituteInPlace setup.py \
-      --replace "version=version," "version='${version}',"
-    # remove extraneous files
-    substituteInPlace setup.cfg \
-      --replace "data_files = *.rst, *.txt" ""
-  '';
-
-  buildInputs = [ httpretty pytest pytest-cov ];
-
-  preCheck = ''
-    # fix compatibility with pytest 4
-    substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]"
-  '';
-
-  propagatedBuildInputs = [ arrow click keyring parsedatetime requests six termcolor ];
-
-  meta = with lib; {
-    homepage = "https://pypi.python.org/pypi/bonfire";
-    description = "CLI Graylog Client with Follow Mode";
-    license = licenses.bsd3;
-    maintainers = [ maintainers.womfoo ];
-    platforms = platforms.linux;
-    broken = true; # no longer compatible with new arrow package
-  };
-}
--- a/pkgs/tools/misc/gnokii/default.nix
+++ b/pkgs/tools/misc/gnokii/default.nix
@ -1,26 +0,0 @@
-{ lib, stdenv, fetchurl, intltool, perl, gettext, libusb-compat-0_1, pkg-config, bluez
-, readline, pcsclite, libical, gtk2, glib, libXpm }:
-
-stdenv.mkDerivation rec {
-  pname = "gnokii";
-  version = "0.6.31";
-
-  src = fetchurl {
-    sha256 = "0sjjhm40662bj6j0jh3sd25b8nww54nirpwamz618rg6pb5hjwm8";
-    url = "https://www.gnokii.org/download/gnokii/${pname}-${version}.tar.gz";
-  };
-
-  buildInputs = [
-    perl intltool gettext libusb-compat-0_1
-    glib gtk2 pkg-config bluez readline
-    libXpm pcsclite libical
-  ];
-
-  meta = {
-    description = "Cellphone tool";
-    homepage = "https://www.gnokii.org";
-    maintainers = [ lib.maintainers.raskin ];
-    platforms = lib.platforms.linux;
-    broken = true; # 2018-04-10
-  };
-}
--- a/pkgs/tools/misc/mht2htm/default.nix
+++ b/pkgs/tools/misc/mht2htm/default.nix
@ -1,44 +0,0 @@
-{ lib, stdenv, fetchurl, unzip, fpc, lazarus }:
-
-let
-  date = "07.apr.2016";
-
-in stdenv.mkDerivation rec {
-  pname = "mht2mht";
-  version = "1.8.1.35";
-
-  src = fetchurl {
-    # there is a disconnect between the directory name date and file name date
-    # you should verify if that is still then case when the next version is released
-    url    = "mirror://sourceforge/mht2htm/mht2htm/1.8.1%20%2805.apr.2016%29/mht2htmcl-${version}_${date}.source.zip";
-    sha256 = "16r6zkihp84yqllp2hyaf0nvymdn9ji3g30mc5scfwycdfanja6f";
-  };
-
-  sourceRoot = ".";
-
-  buildInputs = [ fpc lazarus ];
-
-  nativeBuildInputs = [ unzip ];
-
-  buildPhase = ''
-    runHook preBuild
-    lazbuild --lazarusdir=${lazarus}/share/lazarus mht2htmcl.lpi
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    install -Dm755 -t $out/bin               mht2htmcl
-    install -Dm644 -t $out/share/doc/mht2htm CHANGELOG COPYING README
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Convert .mht files to .html";
-    homepage    = "http://pgm.bpalanka.com/mht2htm.html";
-    license     = licenses.gpl3;
-    maintainers = with maintainers; [ peterhoeg ];
-    platforms   = platforms.all;
-    broken = true; # 2018-04-11
-  };
-}
--- a/pkgs/tools/security/chaps/default.nix
+++ b/pkgs/tools/security/chaps/default.nix
@ -1,91 +0,0 @@
-{ lib, stdenv, fetchFromGitiles, fetchFromGitHub, fetchurl, trousers, leveldb, unzip
-, scons, pkg-config, glib, dbus_cplusplus, dbus, protobuf, openssl, snappy, pam
-}:
-
-let
-  src_chromebase = fetchFromGitiles {
-    url = "https://chromium.googlesource.com/chromium/src/base";
-    rev = "2dfe404711e15e24e79799516400c61b2719d7af";
-    sha256 = "2bd93a3ace4b6767db2c1bd1e16f426c97b8d2133a9cb15f8372b2516cfa65c5";
-  };
-
-  src_gmock = fetchurl {
-    url = "https://googlemock.googlecode.com/files/gmock-1.7.0.zip";
-    sha256 = "0nq98cpnv2jsx2byp4ilam6kydcnziflkc16ikydajmp4mcvpz16";
-  };
-
-  src_platform2 = fetchFromGitiles {
-    url = "https://chromium.googlesource.com/chromiumos/platform2";
-    rev = "e999e989eaa71c3db7314fc7b4e20829b2b5473b";
-    sha256 = "15n1bsv6r7cny7arx0hdb223xzzbk7vkxg2r7xajhl4nsj39adjh";
-  };
-
-in
-
-stdenv.mkDerivation rec {
-  pname = "chaps";
-  version = "0.42-6812";
-
-  src = fetchFromGitHub {
-    owner = "google";
-    repo = "chaps-linux";
-    rev = "989aadc45cdb216ca35b0c97d13fc691576fa1d7";
-    sha256 = "0chk6pnn365d5kcz6vfqx1d0383ksk97icc0lzg0vvb0kvyj0ff1";
-  };
-
-  NIX_CFLAGS_COMPILE = [
-    # readdir_r(3) is deprecated in glibc >= 2.24
-    "-Wno-error=deprecated-declarations"
-    # gcc8 catching polymorphic type error
-    "-Wno-error=catch-value"
-  ];
-
-  patches = [ ./fix_absolute_path.patch  ./fix_environment_variables.patch  ./fix_scons.patch  ./insert_prefetches.patch ];
-
-  postPatch = ''
-    substituteInPlace makefile --replace @@NIXOS_SRC_CHROMEBASE@@ ${src_chromebase}
-    substituteInPlace makefile --replace @@NIXOS_SRC_GMOCK@@ ${src_gmock}
-    substituteInPlace makefile --replace @@NIXOS_SRC_PLATFORM2@@ ${src_platform2}
-    substituteInPlace makefile --replace @@NIXOS_LEVELDB@@ ${leveldb}
-    '';
-
-  nativeBuildInputs = [ unzip scons pkg-config ];
-
-  buildInputs = [ trousers glib dbus_cplusplus dbus protobuf openssl snappy leveldb pam ];
-
-  buildPhase = ''
-    make build
-    '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp ${pname}-${version}/out/chapsd $out/bin/.
-    cp ${pname}-${version}/out/chaps_client $out/bin/.
-
-    mkdir -p $out/lib
-    cp ${pname}-${version}/out/libchaps.so.* $out/lib/.
-    mkdir -p $out/lib/security
-    cp ${pname}-${version}/out/pam_chaps.so $out/lib/security/.
-
-    mkdir -p $out/include
-    cp -r ${pname}-${version}/out/chaps $out/include/.
-
-    mkdir -p $out/etc/dbus-1/system.d
-    cp ${pname}-${version}/out/org.chromium.Chaps.conf $out/etc/dbus-1/system.d/.
-    mkdir -p $out/etc/dbus-1/system-services
-    cp ${pname}-${version}/platform2/chaps/org.chromium.Chaps.service $out/etc/dbus-1/system-services/.
-
-    mkdir -p $out/usr/share/pam-configs/chaps
-    mkdir -p $out/usr/share/man/man8
-    cp ${pname}-${version}/man/* $out/usr/share/man/man8/.
-    '';
-
-  meta = with lib; {
-    description = "PKCS #11 implementation based on trusted platform module (TPM)";
-    homepage = "https://www.chromium.org/developers/design-documents/chaps-technical-design";
-    maintainers = [ maintainers.tstrobel ];
-    platforms = [ "x86_64-linux" ];
-    license = licenses.bsd3;
-    broken = true;  # build failure withn openssl 1.1
-  };
-}
--- a/pkgs/tools/security/chaps/fix_absolute_path.patch
+++ b/pkgs/tools/security/chaps/fix_absolute_path.patch
@ -1,18 +0,0 @@
-diff --git a/patches/platform2/fix_echo.patch b/patches/platform2/fix_echo.patch
-new file mode 100644
-index 0000000..d2272f6
--- /dev/null
-+++ b/patches/platform2/fix_echo.patch
-@@ -0,0 +1,12 @@
-+diff -uNr platform2/common-mk/common.mk platform2-new/common-mk/common.mk
-+--- platform2/common-mk/common.mk	2015-07-03 12:07:47.482745292 +0200
-++++ platform2-new/common-mk/common.mk	2015-07-03 12:08:16.868600569 +0200
-+@@ -263,7 +263,7 @@
-+ $(eval $(call override_var,STRIP,strip))
-+ 
-+ RMDIR ?= rmdir
-+-ECHO = /bin/echo -e
-++ECHO = echo -e
-+ 
-+ ifeq ($(lastword $(subst /, ,$(CC))),clang)
-+ CDRIVER = clang
--- a/pkgs/tools/security/chaps/fix_environment_variables.patch
+++ b/pkgs/tools/security/chaps/fix_environment_variables.patch
@ -1,42 +0,0 @@
-diff --git a/extrasrc/Makefile b/extrasrc/Makefile
-index fb95845..77125c0 100644
--- a/extrasrc/Makefile
-+++ b/extrasrc/Makefile
-@@ -10,11 +10,11 @@ OUTDIR=$(SRCDIR)/out
- GMOCK_DIR=$(SRCDIR)/gmock-$(GMOCK_VER)
- GTEST_DIR=$(GMOCK_DIR)/gtest
- 
-INCLUDES="-I$(SRCDIR)/include -I$(SRCDIR)/platform2/libchromeos -isystem $(GTEST_DIR)/include -I$(GMOCK_DIR)/include -I$(SRCDIR)/leveldb/include"
-+INCLUDES="-I$(SRCDIR)/include -I$(SRCDIR)/platform2/libchromeos -isystem $(GTEST_DIR)/include -I$(GMOCK_DIR)/include -I$(SRCDIR)/leveldb/include $(NIX_LDFLAG) $(NIX_CFLAGS_COMPILE)"
- 
- # To build Chaps, defer to platform2/chaps/Makefile
- all: libchrome-$(BASE_VER).a libchromeos-$(BASE_VER).a | out
-	cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR) CXXFLAGS=$(INCLUDES) OUT=$(OUTDIR) CHAPS_VERSION_MAJOR=$(CHAPS_VERSION_MAJOR) CHAPS_VERSION_MINOR=$(CHAPS_VERSION_MINOR) $(MAKE)
-+	cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR):$(PKG_CONFIG_PATH) CXXFLAGS=$(INCLUDES) OUT=$(OUTDIR) CHAPS_VERSION_MAJOR=$(CHAPS_VERSION_MAJOR) CHAPS_VERSION_MINOR=$(CHAPS_VERSION_MINOR) $(MAKE)
- 
- # To build required Chromium components, defer to scons file.
- libchrome-$(BASE_VER).a:
-@@ -38,7 +38,7 @@ out/libgmock.a: out/gmock-all.o
- 	ar -rv $@ $<
- 
- test: out/libgtest.a out/libgmock.a libchrome-$(BASE_VER).a libchromeos-$(BASE_VER).a | out
-	cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR) CXXFLAGS=$(INCLUDES) LDLIBS="-L$(OUTDIR)" OUT=$(OUTDIR) $(MAKE) tests
-+	cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR):$(PKG_CONFIG_PATH) CXXFLAGS=$(INCLUDES) LDLIBS="-L$(OUTDIR)" OUT=$(OUTDIR) $(MAKE) tests
- 
- clean: clean_chaps clean_chromeos clean_chromebase clean_gmock clean_debian
- clean_gmock:
-@@ -49,7 +49,7 @@ clean_chromebase:
- clean_chromeos:
- 	-BASE_VER=$(BASE_VER) scons -f Sconstruct.libchromeos -c
- clean_chaps:
-	-cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR) $(MAKE) clean
-+	-cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR):$(PKG_CONFIG_PATH) $(MAKE) clean
- 	rm -rf out
- clean_debian:
- 	dh_clean
-@@ -64,4 +64,4 @@ install_man:
- 	$(INSTALL) -m 0644 -D man/chapsd.8 $(MANDIR)/man8/chapsd.8
- 	$(INSTALL) -m 0644 -D man/chaps_client.8 $(MANDIR)/man8/chaps_client.8
- install: install_man
-	cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR) CXXFLAGS=$(INCLUDES) OUT=$(OUTDIR) CHAPS_VERSION_MAJOR=$(CHAPS_VERSION_MAJOR) CHAPS_VERSION_MINOR=$(CHAPS_VERSION_MINOR) $(MAKE) install_files
-+	cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR):$(PKG_CONFIG_PATH) CXXFLAGS=$(INCLUDES) OUT=$(OUTDIR) CHAPS_VERSION_MAJOR=$(CHAPS_VERSION_MAJOR) CHAPS_VERSION_MINOR=$(CHAPS_VERSION_MINOR) $(MAKE) install_files
--- a/pkgs/tools/security/chaps/fix_scons.patch
+++ b/pkgs/tools/security/chaps/fix_scons.patch
@ -1,26 +0,0 @@
-diff --git a/extrasrc/Sconstruct.libchrome b/extrasrc/Sconstruct.libchrome
-index 4feb76d..311fe8a 100644
--- a/extrasrc/Sconstruct.libchrome
-+++ b/extrasrc/Sconstruct.libchrome
-@@ -103,7 +103,7 @@ base_lib = {
-     'pc_libs' : 'glib-2.0',
- }
- 
-env = Environment()
-+env = Environment(ENV = os.environ)
- 
- BASE_VER = os.environ.get('BASE_VER', '0')
- GTEST_DIR = os.environ.get('GTEST_DIR', '0')
-diff --git a/extrasrc/Sconstruct.libchromeos b/extrasrc/Sconstruct.libchromeos
-index 1da6001..66f9acb 100644
--- a/extrasrc/Sconstruct.libchromeos
-+++ b/extrasrc/Sconstruct.libchromeos
-@@ -18,7 +18,7 @@ base_lib = {
-     'pc_libs' : 'dbus-c++-1',
- }
- 
-env = Environment()
-+env = Environment(ENV = os.environ)
- 
- PKG_CONFIG = os.environ.get('PKG_CONFIG', 'pkg-config')
- BASE_VER = os.environ.get('BASE_VER', '0')
--- a/pkgs/tools/security/chaps/insert_prefetches.patch
+++ b/pkgs/tools/security/chaps/insert_prefetches.patch
@ -1,51 +0,0 @@
-diff --git a/makefile b/makefile
-index b6865f3..c14f5ec 100644
--- a/makefile
-+++ b/makefile
-@@ -53,8 +53,8 @@ $(SRCDIR)/include/trousers/scoped_tss_type.h: extrasrc/scoped_tss_type.h | $(SRC
- 	cp $< $@
- # Chromium includes <leveldb/memenv.h>.  This requires an install of libleveldb-dev that has
- # memenv support included; move this into a local leveldb/ subdirectory
-$(SRCDIR)/include/leveldb/memenv.h: /usr/include/leveldb/helpers/memenv.h | $(SRCDIR)/include/leveldb
-	cp $< $@
-+$(SRCDIR)/include/leveldb/memenv.h: $(SRCDIR)/include/leveldb
-+	cp @@NIXOS_LEVELDB@@/include/leveldb/helpers/memenv.h $@
- # Chromium includes <include/testing/gtest/include/gtest/gtest_prod.h>, so have a local copy.
- $(SRCDIR)/include/testing/gtest/include/gtest/gtest_prod.h: extrasrc/gtest_prod.h | $(SRCDIR)/include/testing/gtest/include/gtest
- 	cp $< $@
-@@ -80,7 +80,7 @@ GMOCK_DIR=$(SRCDIR)/gmock-$(GMOCK_VERSION)
- GTEST_DIR=$(GMOCK_DIR)/gtest
- src_gmock: $(GMOCK_DIR)/LICENSE
- $(GMOCK_DIR)/LICENSE: | $(SRCDIR)
-	cd $(SRCDIR) && wget $(GMOCK_URL)
-+	cd $(SRCDIR) && cp @@NIXOS_SRC_GMOCK@@ gmock-$(GMOCK_VERSION).zip && chmod +w gmock-$(GMOCK_VERSION).zip
- 	cd $(SRCDIR) && unzip -q gmock-$(GMOCK_VERSION).zip
- 	rm $(SRCDIR)/gmock-$(GMOCK_VERSION).zip
- 	touch $@
-@@ -107,8 +107,7 @@ src_chromebase: $(SRCDIR)/base/base64.h
- $(SRCDIR)/base: | $(SRCDIR)
- 	mkdir -p $@
- $(SRCDIR)/base/base64.h: | $(SRCDIR)/base
-	git clone $(CHROMEBASE_GIT) $(SRCDIR)/base
-	cd $(SRCDIR)/base && git checkout $(CHROMEBASE_COMMIT)
-+	cp -r @@NIXOS_SRC_CHROMEBASE@@/. $(SRCDIR)/base && chmod -R +w $(SRCDIR)/base
- 
- # We need two subdirectories from the platform2 repository from ChromiumOS:
- #   - chaps/ for the Chaps source code
-@@ -119,14 +118,8 @@ $(SRCDIR)/platform2:
- PLATFORM2_GIT=https://chromium.googlesource.com/chromiumos/platform2
- PATCHES=$(wildcard $(CURDIR)/patches/platform2/*.patch)
- $(SRCDIR)/platform2/chaps/Makefile: | $(SRCDIR)/platform2
-	cd $(SRCDIR)/platform2 && git init . && git remote add -f origin $(PLATFORM2_GIT)
-	cd $(SRCDIR)/platform2 && git config core.sparsecheckout true
-	cd $(SRCDIR)/platform2 && echo "chaps" > .git/info/sparse-checkout
-	cd $(SRCDIR)/platform2 && echo "libchromeos/chromeos" >> .git/info/sparse-checkout
-	cd $(SRCDIR)/platform2 && echo "common-mk/common.mk" >> .git/info/sparse-checkout
-	cd $(SRCDIR)/platform2 && git pull origin master
-	cd $(SRCDIR)/platform2 && git checkout $(CROS_BRANCH)
-	cd $(SRCDIR)/platform2 && if [ ! -z "$(PATCHES)" ]; then git am $(PATCHES); fi
-+	cd $(SRCDIR)/platform2 && cp -r @@NIXOS_SRC_PLATFORM2@@/. . && chmod -R +w $(SRCDIR)/platform2
-+	cd $(SRCDIR)/platform2 && if [ ! -z "$(PATCHES)" ]; then patch -p1 < $(PATCHES); fi
- 
- 
- # Copy man pages
--- a/pkgs/tools/security/meo/default.nix
+++ b/pkgs/tools/security/meo/default.nix
@ -1,36 +0,0 @@
-{ lib, stdenv, fetchhg, openssl, pcre-cpp, qt4, boost, pkcs11helper }:
-
-stdenv.mkDerivation {
-  pname = "meo";
-  version = "unstable-2012-11-13";
-
-  src = fetchhg {
-    url = "http://oss.stamfest.net/hg/meo";
-    rev = "b48e5f16cff8";
-    sha256 = "0ifg7y28s89i9gwda6fyj1jbrykbcvq8bf1m6rxmdcv5afi3arbq";
-  };
-
-  buildFlags = [ "QMAKE=qmake" ];
-
-  buildInputs = [ openssl pcre-cpp qt4 boost pkcs11helper ];
-
-  preConfigure = ''
-    sed -i s,-mt$,, meo-gui/meo-gui.pro
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp tools/{meo,p11} $out/bin
-    cp meo-gui/meo-gui $out/bin
-    cp meo-gui/meo-gui $out/bin
-  '';
-
-  meta = with lib; {
-    homepage = "http://oss.stamfest.net/wordpress/meo-multiple-eyepairs-only";
-    description = "Tools to use cryptography for things like four-eyes principles";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ viric ];
-    platforms = platforms.linux;
-    broken = true;
-  };
-}
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -595,8 +595,6 @@ with pkgs;

  broadlink-cli = callPackage ../tools/misc/broadlink-cli {};

-  mht2htm = callPackage ../tools/misc/mht2htm { };
-
  fetchpatch = callPackage ../build-support/fetchpatch { }
    // {
      tests = pkgs.tests.fetchpatch;
@ -1677,8 +1675,6 @@ with pkgs;

  bonnie = callPackage ../tools/filesystems/bonnie { };

-  bonfire = callPackage ../tools/misc/bonfire { };
-
  botamusique = callPackage ../tools/audio/botamusique { };

  boulder = callPackage ../tools/admin/boulder { };
@ -2298,7 +2294,6 @@ with pkgs;
    filebeat6
    heartbeat6
    metricbeat6
-    packetbeat6
    journalbeat6;

  inherit (callPackages ../misc/logging/beats/7.x.nix { })
@ -2310,7 +2305,6 @@ with pkgs;
  filebeat = filebeat6;
  heartbeat = heartbeat6;
  metricbeat = metricbeat6;
-  packetbeat = packetbeat6;
  journalbeat = journalbeat6;

  bfr = callPackage ../tools/misc/bfr { };
@ -4038,8 +4032,6 @@ with pkgs;
    inherit (darwin.apple_sdk.frameworks) CoreServices;
  };

-  bareos = callPackage ../tools/backup/bareos { };
-
  bats = callPackage ../development/interpreters/bats { };

  bbe = callPackage ../tools/misc/bbe { };
@ -4142,8 +4134,6 @@ with pkgs;

  byzanz = callPackage ../applications/video/byzanz {};

-  ori = callPackage ../tools/backup/ori { };
-
  anydesk = callPackage ../applications/networking/remote/anydesk { };

  anystyle-cli = callPackage ../tools/misc/anystyle-cli { };
@ -5953,10 +5943,6 @@ with pkgs;

  git-delete-merged-branches = callPackage ../applications/version-management/git-and-tools/git-delete-merged-branches { };

-  git-dit = callPackage ../applications/version-management/git-and-tools/git-dit {
-    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
-  };
-
  git-extras = callPackage ../applications/version-management/git-and-tools/git-extras { };

  git-fame = callPackage ../applications/version-management/git-and-tools/git-fame {};
@ -6148,8 +6134,6 @@ with pkgs;

  gnome-randr = callPackage ../tools/wayland/gnome-randr { };

-  gnokii = callPackage ../tools/misc/gnokii { };
-
  gnuapl = callPackage ../development/interpreters/gnu-apl { };

  gnu-shepherd = callPackage ../misc/gnu-shepherd { };
@ -7968,10 +7952,6 @@ with pkgs;

  memtest86plus = callPackage ../tools/misc/memtest86+ { };

-  meo = callPackage ../tools/security/meo {
-    boost = boost155;
-  };
-
  mbutil = python3Packages.callPackage ../applications/misc/mbutil { };

  mc = callPackage ../tools/misc/mc {
@ -8685,8 +8665,6 @@ with pkgs;

  openmvg = callPackage ../applications/science/misc/openmvg { };

-  openmvs = callPackage ../applications/science/misc/openmvs { };
-
  openntpd = callPackage ../tools/networking/openntpd { };

  openntpd_nixos = openntpd.override {
@ -10716,8 +10694,6 @@ with pkgs;

  ttp = with python3.pkgs; toPythonApplication ttp;

-  chaps = callPackage ../tools/security/chaps { };
-
  trace-cmd = callPackage ../os-specific/linux/trace-cmd { };

  kernelshark = libsForQt5.callPackage ../os-specific/linux/trace-cmd/kernelshark.nix { };
@ -11972,12 +11948,8 @@ with pkgs;
    jdk = jdk8;
  };

-  aldor = callPackage ../development/compilers/aldor { };
-
  algol68g = callPackage ../development/compilers/algol68g { };

-  aliceml = callPackage ../development/compilers/aliceml { };
-
  armips = callPackage ../development/compilers/armips { };

  arachne-pnr = callPackage ../development/compilers/arachne-pnr { };
@ -12737,8 +12709,6 @@ with pkgs;
  haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { });
  inherit (haxePackages) hxcpp;

-  hhvm = callPackage ../development/compilers/hhvm { };
-
  hop = callPackage ../development/compilers/hop { };

  falcon = callPackage ../development/interpreters/falcon { };
@ -13258,8 +13228,6 @@ with pkgs;

  orocos-kdl = callPackage ../development/libraries/orocos-kdl { };

-  metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { };
-
  ber_metaocaml = callPackage ../development/compilers/ocaml/ber-metaocaml.nix { };

  ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { };
@ -14093,11 +14061,6 @@ with pkgs;
  polyml56 = callPackage ../development/compilers/polyml/5.6.nix { };
  polyml57 = callPackage ../development/compilers/polyml/5.7.nix { };

-  pure = callPackage ../development/interpreters/pure {
-    /*llvm = llvm_35;*/
-  };
-  purePackages = recurseIntoAttrs (callPackage ./pure-packages.nix {});
-
  # Python interpreters. All standard library modules are included except for tkinter, which is
  # available as `pythonPackages.tkinter` and can be used as any other Python package.
  # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md
@ -14352,11 +14315,6 @@ with pkgs;

  avr8burnomat = callPackage ../development/misc/avr8-burn-omat { };

-  betaflight = callPackage ../development/embedded/stm32/betaflight {
-    gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
-    binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
-  };
-
  sourceFromHead = callPackage ../build-support/source-from-head-fun.nix {};

  jruby = callPackage ../development/interpreters/jruby { };
@ -14406,11 +14364,6 @@ with pkgs;
    guile = guile_2_0;
  };

-  inav = callPackage ../development/embedded/stm32/inav {
-    gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
-    binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
-  };
-
  inav-blackbox-tools = callPackage ../tools/misc/inav-blackbox-tools { };

  infracost = callPackage ../tools/misc/infracost { };
@ -17297,10 +17250,6 @@ with pkgs;
    autoconf = buildPackages.autoconf269;
  };

-  gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix {
-    gperf = gperf_3_0;
-  };
-
  gpac = callPackage ../applications/video/gpac { };

  gpgme = callPackage ../development/libraries/gpgme { };
@ -17331,8 +17280,6 @@ with pkgs;

  gtkimageview = callPackage ../development/libraries/gtkimageview { };

-  gtkmathview = callPackage ../development/libraries/gtkmathview { };
-
  glib = callPackage ../development/libraries/glib (let
    glib-untested = glib.override { doCheck = false; };
  in {
@ -17395,8 +17342,6 @@ with pkgs;
    inherit (darwin.apple_sdk.frameworks) ApplicationServices;
  };

-  gdata-sharp = callPackage ../development/libraries/gdata-sharp { };
-
  gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { };

  gdk-pixbuf-xlib = callPackage ../development/libraries/gdk-pixbuf/xlib.nix { };
@ -17646,8 +17591,6 @@ with pkgs;

  ilbc = callPackage ../development/libraries/ilbc { };

-  ilixi = callPackage ../development/libraries/ilixi { };
-
  ilmbase = callPackage ../development/libraries/ilmbase { };

  imgui = callPackage ../development/libraries/imgui { };
@ -20002,8 +19945,6 @@ with pkgs;
    inherit (darwin.apple_sdk.frameworks) AGL;
  };

-  qxt = callPackage ../development/libraries/qxt {};
-
  rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {};

  raft-canonical = callPackage ../development/libraries/raft-canonical { };
@ -21679,8 +21620,6 @@ with pkgs;
    buildGoModule = buildGo116Module;
  };

-  myserver = callPackage ../servers/http/myserver { };
-
  napalm = with python3Packages; toPythonApplication (
    napalm.overridePythonAttrs (attrs: {
      # add community frontends that depend on the napalm python package
@ -21774,8 +21713,6 @@ with pkgs;
  opensmtpd-extras = callPackage ../servers/mail/opensmtpd/extras.nix { };
  opensmtpd-filter-rspamd = callPackage ../servers/mail/opensmtpd/filter-rspamd.nix { };

-  openxpki = callPackage ../servers/openxpki { };
-
  openxr-loader = callPackage ../development/libraries/openxr-loader { };

  osrm-backend = callPackage ../servers/osrm-backend { };
@ -22026,8 +21963,6 @@ with pkgs;

  oidentd = callPackage ../servers/identd/oidentd { };

-  openfire = callPackage ../servers/xmpp/openfire { };
-
  softether = callPackage ../servers/softether { };

  qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { };
@ -24451,14 +24386,10 @@ with pkgs;

  poppler_data = callPackage ../data/misc/poppler-data { };

-  qmc2 = libsForQt514.callPackage ../applications/emulators/qmc2 { };
-
  quattrocento = callPackage ../data/fonts/quattrocento {};

  quattrocento-sans = callPackage ../data/fonts/quattrocento-sans {};

-  r3rs = callPackage ../data/documentation/rnrs/r3rs.nix { };
-
  r4rs = callPackage ../data/documentation/rnrs/r4rs.nix { };

  r5rs = callPackage ../data/documentation/rnrs/r5rs.nix { };
@ -24998,10 +24929,6 @@ with pkgs;
    glew = glew110;
  };

-  bitkeeper = callPackage ../applications/version-management/bitkeeper {
-    gperf = gperf_3_0;
-  };
-
  bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };
  bitlbee-plugins = callPackage ../applications/networking/instant-messengers/bitlbee/plugins.nix { };

@ -25221,8 +25148,6 @@ with pkgs;
    inherit (xorg) libSM;
  };

-  clfswm = callPackage ../applications/window-managers/clfswm { };
-
  clickshare-csc1 = callPackage ../applications/video/clickshare-csc1 { };

  cligh = python3Packages.callPackage ../development/tools/github/cligh {};
@ -25827,8 +25752,6 @@ with pkgs;

  fontpreview = callPackage ../applications/misc/fontpreview { };

-  foo-yc20 = callPackage ../applications/audio/foo-yc20 { };
-
  fossil = callPackage ../applications/version-management/fossil {
    sqlite = sqlite.override { enableDeserialize = true; };
  };
@ -26051,8 +25974,6 @@ with pkgs;

  gjay = callPackage ../applications/audio/gjay { };

-  photivo = callPackage ../applications/graphics/photivo { };
-
  rhythmbox = callPackage ../applications/audio/rhythmbox { };

  gradio = callPackage ../applications/audio/gradio { };
@ -28282,8 +28203,6 @@ with pkgs;

  notepadqq = libsForQt514.callPackage ../applications/editors/notepadqq { };

-  notbit = callPackage ../applications/networking/mailreaders/notbit { };
-
  notmuch = callPackage ../applications/networking/mailreaders/notmuch {
    gmime = gmime3;
    pythonPackages = python3Packages;
@ -32413,8 +32332,6 @@ with pkgs;

  mosdepth = callPackage ../applications/science/biology/mosdepth { };

-  ncbi_tools = callPackage ../applications/science/biology/ncbi-tools { };
-
  niftyreg = callPackage ../applications/science/biology/niftyreg { };

  niftyseg = callPackage ../applications/science/biology/niftyseg { };
@ -32850,14 +32767,11 @@ with pkgs;

  iprover = callPackage ../applications/science/logic/iprover { };

-  jonprl = callPackage ../applications/science/logic/jonprl { };
-
  key = callPackage ../applications/science/logic/key { };

  keymapviz = callPackage ../tools/misc/keymapviz { };

  lean = callPackage ../applications/science/logic/lean {};
-  lean2 = callPackage ../applications/science/logic/lean2 {};
  lean3 = lean;
  elan = callPackage ../applications/science/logic/elan {};
  mathlibtools = with python3Packages; toPythonApplication mathlibtools;
@ -32887,8 +32801,6 @@ with pkgs;

  ott = callPackage ../applications/science/logic/ott { };

-  otter = callPackage ../applications/science/logic/otter {};
-
  picosat = callPackage ../applications/science/logic/picosat {};

  libpoly = callPackage ../applications/science/logic/poly {};
@ -33216,8 +33128,6 @@ with pkgs;

  sq = callPackage ../development/tools/sq { };

-  openspace = callPackage ../applications/science/astronomy/openspace { };
-
  stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { };

  stellarsolver = libsForQt5.callPackage ../development/libraries/science/astronomy/stellarsolver { };
@ -33479,8 +33389,6 @@ with pkgs;

  glee = callPackage ../tools/graphics/glee { };

-  fakenes = callPackage ../applications/emulators/fakenes { };
-
  faust = res.faust2;

  faust1 = callPackage ../applications/audio/faust/faust1.nix { };
@ -34774,8 +34682,6 @@ with pkgs;

  tomb = callPackage ../os-specific/linux/tomb {};

-  imatix_gsl = callPackage ../development/tools/imatix_gsl {};
-
  sccache = callPackage ../development/tools/misc/sccache {
    inherit (darwin.apple_sdk.frameworks) Security;
  };
--- a/pkgs/top-level/pure-packages.nix
+++ b/pkgs/top-level/pure-packages.nix
@ -1,33 +0,0 @@
-{ callPackage }:
-
-rec {
-  audio = callPackage ../development/pure-modules/audio { };
-  avahi = callPackage ../development/pure-modules/avahi { };
-  csv = callPackage ../development/pure-modules/csv { };
-  doc = callPackage ../development/pure-modules/doc { };
-  fastcgi = callPackage ../development/pure-modules/fastcgi { };
-  faust = callPackage ../development/pure-modules/faust { };
-  ffi = callPackage ../development/pure-modules/ffi { };
-  gen = callPackage ../development/pure-modules/gen { };
-  gl = callPackage ../development/pure-modules/gl { };
-  glpk = callPackage ../development/pure-modules/glpk { };
-  gplot = callPackage ../development/pure-modules/gplot { };
-  gsl = callPackage ../development/pure-modules/gsl { };
-  gtk = callPackage ../development/pure-modules/gtk { pure-ffi = ffi; };
-  liblo = callPackage ../development/pure-modules/liblo { };
-  lilv = callPackage ../development/pure-modules/lilv { };
-  lv2 = callPackage ../development/pure-modules/lv2 { };
-  midi = callPackage ../development/pure-modules/midi { };
-  mpfr = callPackage ../development/pure-modules/mpfr { };
-  octave = callPackage ../development/pure-modules/octave { };
-  odbc = callPackage ../development/pure-modules/odbc { };
-  pandoc = callPackage ../development/pure-modules/pandoc { };
-  rational = callPackage ../development/pure-modules/rational { };
-  readline = callPackage ../development/pure-modules/readline { };
-  sockets = callPackage ../development/pure-modules/sockets { };
-  sql3 = callPackage ../development/pure-modules/sql3 { };
-  stldict = callPackage ../development/pure-modules/stldict { };
-  stllib = callPackage ../development/pure-modules/stllib { };
-  tk = callPackage ../development/pure-modules/tk { };
-  xml = callPackage ../development/pure-modules/xml { };
-}