Merge master into staging-next

2021-08-05 18:03:00 +00:00 · 2021-08-05 18:03:00 +00:00 · cb64ec05dd
commit cb64ec05dd
parent a4174a93f2 06552b7234
66 changed files with 1537 additions and 1137 deletions
--- a/doc/languages-frameworks/node.section.md
+++ b/doc/languages-frameworks/node.section.md
@ -39,7 +39,7 @@ To add a package from NPM to nixpkgs:
 1. Modify `pkgs/development/node-packages/node-packages.json` to add, update
    or remove package entries to have it included in `nodePackages` and
    `nodePackages_latest`.
- 2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`.
+ 2. Run the script: `cd pkgs/development/node-packages && ./generate.sh`.
 3. Build your new package to test your changes:
    `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
    To build against the latest stable Current Node.js version (e.g. 14.x):
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -4007,6 +4007,16 @@
      fingerprint = "5214 2D39 A7CE F8FA 872B  CA7F DE62 E1E2 A614 5556";
    }];
  };
+  gpanders = {
+    name = "Gregory Anders";
+    email = "greg@gpanders.com";
+    github = "gpanders";
+    githubId = 8965202;
+    keys = [{
+      longkeyid = "rsa2048/0x56E93C2FB6B08BDB";
+      fingerprint = "B9D5 0EDF E95E ECD0 C135  00A9 56E9 3C2F B6B0 8BDB";
+    }];
+  };
  gpyh = {
    email = "yacine.hmito@gmail.com";
    github = "yacinehmito";
--- a/nixos/tests/signal-desktop.nix
+++ b/nixos/tests/signal-desktop.nix
@ -1,6 +1,16 @@
 import ./make-test-python.nix ({ pkgs, ...} :

-{
+let
+  sqlcipher-signal = pkgs.writeShellScriptBin "sqlcipher" ''
+    set -eu
+
+    readonly CFG=~/.config/Signal/config.json
+    readonly KEY="$(${pkgs.jq}/bin/jq --raw-output '.key' $CFG)"
+    readonly DB="$1"
+    readonly SQL="SELECT * FROM sqlite_master where type='table'"
+    ${pkgs.sqlcipher}/bin/sqlcipher "$DB" "PRAGMA key = \"x'$KEY'\"; $SQL"
+  '';
+in {
  name = "signal-desktop";
  meta = with pkgs.lib.maintainers; {
    maintainers = [ flokli primeos ];
@ -16,7 +26,9 @@ import ./make-test-python.nix ({ pkgs, ...} :

    services.xserver.enable = true;
    test-support.displayManager.auto.user = "alice";
-    environment.systemPackages = with pkgs; [ signal-desktop file ];
+    environment.systemPackages = with pkgs; [
+      signal-desktop file sqlite sqlcipher-signal
+    ];
    virtualisation.memorySize = 1024;
  };

@ -44,11 +56,15 @@ import ./make-test-python.nix ({ pkgs, ...} :
    # - https://github.com/NixOS/nixpkgs/issues/108772
    # - https://github.com/NixOS/nixpkgs/pull/117555
    print(machine.succeed("su - alice -c 'file ~/.config/Signal/sql/db.sqlite'"))
-    machine.succeed(
-        "su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep 'db.sqlite: data'"
-    )
    machine.fail(
        "su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep -e SQLite -e database"
    )
+    # Only SQLCipher should be able to read the encrypted DB:
+    machine.fail(
+        "su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .databases'"
+    )
+    print(machine.succeed(
+        "su - alice -c 'sqlcipher ~/.config/Signal/sql/db.sqlite'"
+    ))
  '';
 })
--- a/pkgs/applications/graphics/akira/default.nix
+++ b/pkgs/applications/graphics/akira/default.nix
@ -13,23 +13,24 @@
 , wrapGAppsHook
 , cairo
 , glib
-, goocanvas2
+, goocanvas3
 , gtk3
 , gtksourceview3
 , json-glib
 , libarchive
 , libgee
-, libxml2 }:
+, libxml2
+}:

 stdenv.mkDerivation rec {
  pname = "akira";
-  version = "0.0.13";
+  version = "0.0.14";

  src = fetchFromGitHub {
    owner = "akiraux";
    repo = "Akira";
    rev = "v${version}";
-    sha256 = "1i20q78jagy8xky68nmd0n7mqvh88r98kp626rnlgyzvlc3c22cm";
+    sha256 = "1zbb2bsc6v2rwrbigbkgrzfjmlj96s3ri73zbdcyqg4p08v1w4l6";
  };

  nativeBuildInputs = [
@ -47,7 +48,7 @@ stdenv.mkDerivation rec {
  buildInputs = [
    cairo
    glib
-    goocanvas2
+    goocanvas3
    pantheon.granite
    gtk3
    gtksourceview3
@ -67,7 +68,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "Native Linux Design application built in Vala and GTK";
    homepage = "https://github.com/akiraux/Akira";
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
    maintainers = with maintainers; [ Br1ght0ne neonfuz ] ++ pantheon.maintainers;
    platforms = platforms.linux;
  };
--- a/pkgs/applications/graphics/sane/backends/default.nix
+++ b/pkgs/applications/graphics/sane/backends/default.nix
@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, runtimeShell
 , gettext, pkg-config, python3
 , avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp
-, curl, systemd, libxml2, poppler
+, curl, systemd, libxml2, poppler, gawk
 , sane-drivers

 # List of { src name backend } attibute sets - see installFirmware below:
@ -51,6 +51,7 @@ stdenv.mkDerivation {
    systemd
    libxml2
    poppler
+    gawk
  ];

  enableParallelBuilding = true;
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@ -60,6 +60,11 @@ stdenv.mkDerivation rec {
      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=cee7cefc610d42fd383b3c80c12cbc675443176a";
      sha256 = "18g9jsj90jnqibaff8pqi70a7x8ygc3sh4jl4xnvlv8vr7fxxbh6";
    })
+    (fetchpatch {
+      name = "CVE-2021-37220.patch";
+      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=f5712c9949d026e4b891b25837edd2edc166151f";
+      sha256 = "1zyw6w6zr7k2akpzkyycj2zzw3y5qc7afsn1ysklfj2rvb6cnsx3";
+    })
  ];

  postPatch = ''
--- a/pkgs/applications/misc/nwg-launchers/default.nix
+++ b/pkgs/applications/misc/nwg-launchers/default.nix
@ -8,17 +8,18 @@
 , pkg-config
 , swaylock
 , makeWrapper
+, gtk-layer-shell
 }:

 stdenv.mkDerivation rec {
  pname = "nwg-launchers";
-  version = "0.4.4";
+  version = "0.5.0";

  src = fetchFromGitHub {
    owner = "nwg-piotr";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-krhFtFQZSwfKPHmVxPGNySPL2Y9+kA0fxjZ/D+mNks4=";
+    sha256 = "sha256-ZtlAs7McVQKH626h2iOhjpVaiEHeaqs9ncZ6/KnGibg=";
  };

  nativeBuildInputs = [
@ -32,6 +33,7 @@ stdenv.mkDerivation rec {
  buildInputs = [
    gtkmm3
    nlohmann_json
+    gtk-layer-shell
  ];

  postInstall = ''
--- a/pkgs/applications/misc/nwg-menu/default.nix
+++ b/pkgs/applications/misc/nwg-menu/default.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "nwg-menu";
-  version = "unstable-2021-06-12";
+  version = "0.1.1";

  src = fetchFromGitHub {
    owner = "nwg-piotr";
    repo = "nwg-menu";
-    rev = "b0746e26514a047ed9c6b975a71b7263aa39bd56";
-    hash = "sha256-rxyf3CfpfWnRAlIR/pl+s7LGAZbZjdtNWPPK7BecdhQ=";
+    rev = "v${version}";
+    sha256 = "sha256-M948RGU9/PwUtFRmf1Po7KlrGxqRPiOZKfS1Vv3vqW8=";
  };

-  vendorSha256 = "sha256-nN5iBleK12SKY9PBiDA+tM4B8FiVGZLXbtJM2+YrEfA=";
+  vendorSha256 = "sha256-AnYtqSe8mq10FQ071GEVh65MaWek5gYlR+9d8yL0RAc=";

  runVend = true;

--- a/pkgs/applications/misc/nwg-panel/default.nix
+++ b/pkgs/applications/misc/nwg-panel/default.nix
@ -13,13 +13,13 @@

 python3Packages.buildPythonApplication rec {
  pname = "nwg-panel";
-  version = "0.3.2";
+  version = "0.4.2";

  src = fetchFromGitHub {
    owner = "nwg-piotr";
    repo = "nwg-panel";
    rev = "v${version}";
-    hash = "sha256-x5lGVF6eRhOVXrsBatdsiUiWs/+FxRlCtp79zA206RY=";
+    sha256 = "sha256-+zJNTFYNIJKa5jK/215MoxjMKScCdWAAh4cQjEise/Q=";
  };

  # No tests
--- a/pkgs/applications/misc/nwg-wrapper/default.nix
+++ b/pkgs/applications/misc/nwg-wrapper/default.nix
@ -2,13 +2,13 @@

 python3Packages.buildPythonPackage rec {
  pname = "nwg-wrapper";
-  version = "0.0.1";
+  version = "0.0.2";

  src = fetchFromGitHub {
    owner = "nwg-piotr";
    repo = pname;
    rev = "v${version}";
-    sha256 = "1rpkcjr0chmgsfkan88lsi476bamg9a6y7h0x9zsh60a9rdf7dl8";
+    sha256 = "sha256-LkAB0MrwQxP3X7glfSnI0GZMv8tjaeSOz7WSOW33wuo=";
  };

  nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@ -18,9 +18,9 @@
    }
  },
  "beta": {
-    "version": "93.0.4577.18",
-    "sha256": "1h1ppyizj5vbnrv11iy9vlcpcv8mgb9r8m2zmz6vp7q1ch6w0w4x",
-    "sha256bin64": "1s5qj0pd79qbchq3awhxc86l9vmi6304z7sd9ls9f8q138789cha",
+    "version": "93.0.4577.25",
+    "sha256": "09v7wyy9xwrpzmsa030j8jjww30jps3lbvlq4bzppdg04fk6rbsn",
+    "sha256bin64": "1l86aqym4dxsrp81ppv5cwyki4wnh7cpqy4dw88kdxgqbiwwii27",
    "deps": {
      "gn": {
        "version": "2021-07-08",
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
@ -5,6 +5,8 @@
 , Security
 , AppKit
 , CoreServices
+
+, useWayland ? false
 }:
 # Notes for maintainers:
 # * versions of `element-web` and `element-desktop` should be kept in sync.
@ -68,7 +70,7 @@ in mkYarnPackage rec {

    # executable wrapper
    makeWrapper '${electron_exec}' "$out/bin/${executableName}" \
-      --add-flags "$out/share/element/electron"
+      --add-flags "$out/share/element/electron${lib.optionalString useWayland " --enable-features=UseOzonePlatform --ozone-platform=wayland"}"
  '';

  # Do not attempt generating a tarball for element-web again.
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@ -2,7 +2,7 @@
 , lib
 , fetchurl
 , makeWrapper
-# Dynamic libraries
+  # Dynamic libraries
 , alsa-lib
 , atk
 , cairo
@ -18,22 +18,21 @@
 , xorg
 , libxkbcommon
 , zlib
-# Runtime
+  # Runtime
 , coreutils
 , pciutils
 , procps
 , util-linux
-, pulseaudioSupport ? true, libpulseaudio ? null
+, pulseaudioSupport ? true
+, libpulseaudio
 }:

-assert pulseaudioSupport -> libpulseaudio != null;
-
 let
-  version = "5.7.28852.0718";
+  version = "5.7.28991.0726";
  srcs = {
    x86_64-linux = fetchurl {
      url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
-      sha256 = "NoB9qxsuGsiwsZ3Y+F3WZpszujPBX/nehtFFI+KPV5E=";
+      sha256 = "w1oeMKADG5+7EV1OXyuEbotrwcVywob82KOXKoRUifA=";
    };
  };

@ -65,9 +64,11 @@ let
    xorg.libXtst
  ] ++ lib.optional (pulseaudioSupport) libpulseaudio);

-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
  pname = "zoom";
  inherit version;
+
  src = srcs.${stdenv.hostPlatform.system};

  dontUnpack = true;
@ -118,11 +119,11 @@ in stdenv.mkDerivation rec {

  passthru.updateScript = ./update.sh;

-  meta = {
+  meta = with lib; {
    homepage = "https://zoom.us/";
    description = "zoom.us video conferencing application";
-    license = lib.licenses.unfree;
+    license = licenses.unfree;
    platforms = builtins.attrNames srcs;
-    maintainers = with lib.maintainers; [ danbst tadfisher doronbehar ];
+    maintainers = with maintainers; [ danbst tadfisher doronbehar ];
  };
 }
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@ -21,13 +21,13 @@

 mkDerivation rec {
  pname = "nextcloud-client";
-  version = "3.2.4";
+  version = "3.3.0";

  src = fetchFromGitHub {
    owner = "nextcloud";
    repo = "desktop";
    rev = "v${version}";
-    sha256 = "sha256-+APRR3Qj8jdDG2wc4hXFF40aTeoLGAXlsCsB4zKDI3Q=";
+    sha256 = "sha256-KMFFRxNQUNcu7Q5515lNbEMyCWIvzXXC//s3WAWxw4g=";
  };

  patches = [
@ -70,7 +70,7 @@ mkDerivation rec {
    description = "Nextcloud themed desktop client";
    homepage = "https://nextcloud.com";
    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ caugner ];
+    maintainers = with maintainers; [ caugner kranzes ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/office/autokey/default.nix
+++ b/pkgs/applications/office/autokey/default.nix
@ -1,32 +1,57 @@
-{ lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection
-, gtksourceview3, libappindicator-gtk3, libnotify }:
+{ lib
+, python3Packages
+, fetchFromGitHub
+, wrapGAppsHook
+, gobject-introspection
+, gtksourceview3
+, libappindicator-gtk3
+, libnotify
+}:

 python3Packages.buildPythonApplication rec {
-  name = "autokey-${version}";
-  version = "0.94.1";
+  pname = "autokey";
+  version = "0.95.10";

  src = fetchFromGitHub {
    owner = "autokey";
    repo = "autokey";
    rev = "v${version}";
-    sha256 = "1syxyciyxzs0khbfs9wjgj03q967p948kipw27j1031q0b5z3jxr";
+    sha256 = "0f0cqfnb49wwdy7zl2f2ypcnd5pc8r8n7z7ssxkq20d4xfxlgamr";
  };

-  # Arch requires a similar work around—see
-  # https://aur.archlinux.org/packages/autokey-py3/?comments=all
-  patches = [ ./remove-requires-dbus-python.patch ];
-
  # Tests appear to be broken with import errors within the project structure
  doCheck = false;

-  # Note: no dependencies included for Qt GUI because Qt ui is poorly
-  # maintained—see https://github.com/autokey/autokey/issues/51
+  nativeBuildInputs = [ wrapGAppsHook ];

-  buildInputs = [ wrapGAppsHook gobject-introspection gtksourceview3
-    libappindicator-gtk3 libnotify ];
+  buildInputs = [
+    gobject-introspection
+    gtksourceview3
+    libappindicator-gtk3
+    libnotify
+  ];

  propagatedBuildInputs = with python3Packages; [
-    dbus-python pyinotify xlib pygobject3 ];
+    dbus-python
+    pyinotify
+    xlib
+    pygobject3
+  ];
+
+  dontWrapGapps = true;
+
+  pythonPath = with python3Packages; requiredPythonModules [ dbus-python xlib pygobject3 ];
+
+  postInstall = ''
+    rm $out/bin/autokey-qt
+    buildPythonPath "$out $pythonPath"
+    makeWrapperArgs+=(
+      "''${gappsWrapperArgs[@]}"
+      # for autokey-shell ModuleNotFoundError: No module named 'autokey'
+      --prefix "PYTHONPATH" ":" "$out/lib/${python3Packages.python.libPrefix}/site-packages"
+      --prefix "PYTHONPATH" ":" "$program_PYTHONPATH"
+    )
+  '';

  meta = {
    homepage = "https://github.com/autokey/autokey";
--- a/pkgs/applications/office/envelope/default.nix
+++ b/pkgs/applications/office/envelope/default.nix
@ -1,81 +0,0 @@
-{ lib, stdenv
-, fetchFromGitHub
-, nix-update-script
-, fetchpatch
-, meson
-, ninja
-, pkg-config
-, pantheon
-, python3
-, vala
-, appstream-glib
-, desktop-file-utils
-, gettext
-, glib
-, gtk3
-, libgee
-, sqlite
-, wrapGAppsHook
-}:
-
-stdenv.mkDerivation rec {
-  pname = "envelope";
-  version = "0.0.4";
-
-  src = fetchFromGitHub {
-    owner = "cjfloss";
-    repo = pname;
-    rev = version;
-    sha256 = "111lq1gijcm7qwpac09q11ymwiw2x3m12a28ki52f28fb1amvffc";
-  };
-
-  nativeBuildInputs = [
-    appstream-glib
-    desktop-file-utils
-    gettext
-    meson
-    ninja
-    vala
-    pkg-config
-    python3
-    wrapGAppsHook
-  ];
-
-  buildInputs = [
-    glib
-    gtk3
-    libgee
-    pantheon.granite
-    sqlite
-  ];
-
-  doCheck = true;
-
-  patches = [
-    # Fix AppData Validation.
-    # https://github.com/cjfloss/envelope/pull/59
-    (fetchpatch {
-      url = "https://github.com/cjfloss/envelope/commit/b6a28eced89b8f944479fcc695aebfb9aae0c691.patch";
-      sha256 = "11znc8z52kl893n3gmmdpnp3y4vpzmb263m5gp0qxbl3xykq2wzr";
-    })
-  ];
-
-  postPatch = ''
-    chmod +x data/post_install.py
-    patchShebangs data/post_install.py
-  '';
-
-  passthru = {
-    updateScript = nix-update-script {
-      attrPath = pname;
-    };
-  };
-
-  meta = with lib; {
-    description = "Personal finance manager for elementary OS";
-    homepage = "https://github.com/cjfloss/envelope";
-    maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;
-    platforms = platforms.linux;
-    license = licenses.gpl3Plus;
-  };
-}
--- a/pkgs/applications/science/chemistry/openmolcas/default.nix
+++ b/pkgs/applications/science/chemistry/openmolcas/default.nix
@ -5,9 +5,9 @@
 } :

 let
-  version = "21.02";
+  version = "21.06";
  # The tag keeps moving, fix a hash instead
-  gitLabRev = "41cee871945ac712e86ee971425a49a8fc60a936";
+  gitLabRev = "dd982ad4bc94dec8ac1e3e99cb6a7dd249ff71de";

  python = python3.withPackages (ps : with ps; [ six pyparsing ]);

@ -19,7 +19,7 @@ in stdenv.mkDerivation {
    owner = "Molcas";
    repo = "OpenMolcas";
    rev = gitLabRev;
-    sha256 = "0cap53gy1wds2qaxbijw09fqhvfxphfkr93nhp9xdq84yxh4wzv6";
+    sha256 = "07dm73n0s7ckif561yb3s9yqxsv39a73kb9qwny4yp39wdvv52hz";
  };

  patches = [
--- a/pkgs/applications/science/electronics/lepton-eda/default.nix
+++ b/pkgs/applications/science/electronics/lepton-eda/default.nix
@ -0,0 +1,61 @@
+{ stdenv
+, lib
+, pkg-config
+, makeWrapper
+, texinfo
+, fetchurl
+, autoreconfHook
+, guile
+, flex
+, gtk2
+, glib
+, gtkextra
+, gettext
+, gawk
+, shared-mime-info
+, groff
+, libstroke
+}:
+
+stdenv.mkDerivation rec {
+  pname = "lepton-eda";
+  version = "1.9.13-20201211";
+
+  src = fetchurl {
+    url = "https://github.com/lepton-eda/lepton-eda/releases/download/${version}/lepton-eda-${builtins.head (lib.splitString "-" version)}.tar.gz";
+    sha256 = "sha256-9Be3FBWnZU2M5aNQwi3N8M81e0S7n46mwWQh1mrK4Z8=";
+  };
+
+  nativeBuildInputs = [ pkg-config makeWrapper texinfo autoreconfHook ];
+
+  propagatedBuildInputs = [ guile flex gtk2 glib gtkextra gettext gawk shared-mime-info groff libstroke ];
+
+  configureFlags = [
+    "--disable-update-xdg-database"
+  ];
+
+  CFLAGS = [
+    "-DSCM_DEBUG_TYPING_STRICTNESS=2"
+  ];
+
+  postInstall = ''
+    libs="${lib.makeLibraryPath propagatedBuildInputs}"
+    for program in $out/bin/*; do
+      wrapProgram "$program" \
+        --prefix LD_LIBRARY_PATH : "$libs" \
+        --prefix LTDL_LIBRARY_PATH : "$out/lib"
+    done
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/lepton-eda";
+    description = "Lepton Electronic Design Automation";
+    longDescription = ''
+      Lepton EDA is a suite of free software tools for designing electronics.
+      It provides schematic capture, netlisting into over 30 netlist formats, and many other features.
+    '';
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ tesq0 ];
+  };
+}
--- a/pkgs/applications/terminal-emulators/hyper/default.nix
+++ b/pkgs/applications/terminal-emulators/hyper/default.nix
@ -1,36 +1,48 @@
 { stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk3, cairo
-, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
-, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
-, libxcb, nss, nspr, alsa-lib, cups, expat, udev, libpulseaudio, at-spi2-atk }:
+, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
+, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver, libxcb, nss, nspr
+, alsa-lib, cups, expat, udev, libpulseaudio, at-spi2-atk, at-spi2-core, libxshmfence
+, libdrm, libxkbcommon, mesa }:

 let
  libPath = lib.makeLibraryPath [
    stdenv.cc.cc gtk3 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
    libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
    libXrender libX11 libXtst libXScrnSaver nss nspr alsa-lib cups expat udev libpulseaudio
-    at-spi2-atk
+    at-spi2-atk at-spi2-core libxshmfence libdrm libxkbcommon mesa
  ];
+
 in
 stdenv.mkDerivation rec {
-  version = "3.0.2";
  pname = "hyper";
+  version = "3.1.2";
+
  src = fetchurl {
-    url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb";
-    sha256 = "0fv4wv5f8nc739bna83qxmgrvvbyq4w9ch764q2f12wjygrz336p";
+    url = "https://github.com/vercel/hyper/releases/download/v${version}/hyper_${version}_amd64.deb";
+    sha256 = "1mixy9hlgdbbnwdgidady7q828dkf09lx1pacwxw386jj7kp4y5g";
  };
-  buildInputs = [ dpkg ];
+
+  nativeBuildInputs = [ dpkg ];
+
  unpackPhase = ''
    mkdir pkg
    dpkg-deb -x $src pkg
    sourceRoot=pkg
  '';
+
  installPhase = ''
    mkdir -p "$out/bin"
    mv opt "$out/"
+
    ln -s "$out/opt/Hyper/hyper" "$out/bin/hyper"
    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:$out/opt/Hyper:\$ORIGIN" "$out/opt/Hyper/hyper"
+
    mv usr/* "$out/"
+
+    substituteInPlace $out/share/applications/hyper.desktop \
+      --replace "/opt/Hyper/hyper" "hyper"
  '';
+
  dontPatchELF = true;
  meta = with lib; {
    description = "A terminal built on web technologies";
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@ -1,13 +1,13 @@
 {
-  "version": "14.1.1",
-  "repo_hash": "1cygdllhqxah7d8lmx4hcx880wijwfvbbs6dfkdzcn0cd3czpcv8",
+  "version": "14.1.2",
+  "repo_hash": "1d28minrpgp8awcnx15bm7jv0k27i46wji3pc2d6wh1m0wk74b60",
  "owner": "gitlab-org",
  "repo": "gitlab",
-  "rev": "v14.1.1-ee",
+  "rev": "v14.1.2-ee",
  "passthru": {
-    "GITALY_SERVER_VERSION": "14.1.1",
+    "GITALY_SERVER_VERSION": "14.1.2",
    "GITLAB_PAGES_VERSION": "1.41.0",
-    "GITLAB_SHELL_VERSION": "13.19.0",
-    "GITLAB_WORKHORSE_VERSION": "14.1.1"
+    "GITLAB_SHELL_VERSION": "13.19.1",
+    "GITLAB_WORKHORSE_VERSION": "14.1.2"
  }
 }
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv
 , ruby, tzdata, git, nettools, nixosTests, nodejs, openssl
 , gitlabEnterprise ? false, callPackage, yarn
-, fixup_yarn_lock, replace, file
+, fixup_yarn_lock, replace, file, cacert
 }:

 let
@ -51,7 +51,7 @@ let
    pname = "gitlab-assets";
    inherit version src;

-    nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git ];
+    nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git cacert ];

    # Since version 12.6.0, the rake tasks need the location of git,
    # so we have to apply the location patches here too.
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@ -21,14 +21,14 @@ let
      };
  };
 in buildGoModule rec {
-  version = "14.1.1";
+  version = "14.1.2";
  pname = "gitaly";

  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitaly";
    rev = "v${version}";
-    sha256 = "sha256-UCWN9TXbfysNLMOU8bDcjrwYtz7+kTCDQmRAl84ysWU=";
+    sha256 = "sha256-7OqTOJDQJ/ojHevj/ld8VLjm5ZRQgCGZKchPrAlOSO8=";
  };

  vendorSha256 = "sha256-/SZJGRUg0qV7RYCUSGDE/HL9CmzGVffhL6BmZ316tU0=";
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@ -2,12 +2,12 @@

 buildGoModule rec {
  pname = "gitlab-shell";
-  version = "13.19.0";
+  version = "13.19.1";
  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitlab-shell";
    rev = "v${version}";
-    sha256 = "sha256-CmatKArkpDS3GGbIIkKjs4FwywLiU+lRL32GKEpOqZ0=";
+    sha256 = "sha256-F0TW0VjO5hc/lHqZhhMJJvpHazWRyR7Q7W324Fgn7fA=";
  };

  buildInputs = [ ruby ];
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@ -5,7 +5,7 @@ in
 buildGoModule rec {
  pname = "gitlab-workhorse";

-  version = "14.1.1";
+  version = "14.1.2";

  src = fetchFromGitLab {
    owner = data.owner;
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@ -798,7 +798,7 @@ GEM
      nenv (~> 0.1)
      shellany (~> 0.0)
    numerizer (0.2.0)
-    oauth (0.5.4)
+    oauth (0.5.6)
    oauth2 (1.4.7)
      faraday (>= 0.8, < 2.0)
      jwt (>= 1.0, < 3.0)
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@ -3427,10 +3427,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y";
+      sha256 = "1zwd6v39yqfdrpg1p3d9jvzs9ljg55ana2p06m0l7qn5w0lgx1a0";
      type = "gem";
    };
-    version = "0.5.4";
+    version = "0.5.6";
  };
  oauth2 = {
    dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"];
--- a/pkgs/development/compilers/iasl/default.nix
+++ b/pkgs/development/compilers/iasl/default.nix
@ -1,24 +1,27 @@
-{lib, stdenv, fetchurl, fetchpatch, bison, flex}:
+{lib, stdenv, fetchurl, bison, flex}:

 stdenv.mkDerivation rec {
  pname = "iasl";
-  version = "20200110";
+  version = "20210730";

  src = fetchurl {
    url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
-    sha256 = "1cb6aa6acrixmdzvj9vv4qs9lmlsbkd27pjlz14i1kq1x3xn0gwx";
+    sha256 = "1pmm977nyl3bs71ipzcl4dh30qm8x9wm2p2ml0m62rl62kai832a";
  };

  NIX_CFLAGS_COMPILE = "-O3";

  buildFlags = [ "iasl" ];

-  buildInputs = [ bison flex ];
+  nativeBuildInputs = [ bison flex ];

  installPhase =
    ''
-      install -d $out/bin
-      install generate/unix/bin*/iasl $out/bin
+      runHook preInstall
+
+      install -Dm755 generate/unix/bin*/iasl -t $out/bin
+
+      runHook postInstall
    '';

  meta = {
--- a/pkgs/development/libraries/goocanvas/3.x.nix
+++ b/pkgs/development/libraries/goocanvas/3.x.nix
@ -0,0 +1,49 @@
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, gettext
+, gobject-introspection
+, gtk-doc
+, python3
+, cairo
+, gtk3
+, glib
+}:
+
+stdenv.mkDerivation rec {
+  pname = "goocanvas";
+  version = "3.0.0";
+
+  outputs = [ "out" "dev" "devdoc" ];
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/goocanvas/${lib.versions.majorMinor version}/goocanvas-${version}.tar.xz";
+    sha256 = "06j05g2lmwvklmv51xsb7gm7rszcarhm01sal41jfp0qzrbpa2k7";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    gettext
+    gobject-introspection
+    gtk-doc
+    python3
+  ];
+
+  buildInputs = [
+    cairo
+    gtk3
+    glib
+  ];
+
+  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0";
+  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0";
+
+  meta = with lib; {
+    description = "Canvas widget for GTK based on the the Cairo 2D library";
+    homepage = "https://wiki.gnome.org/Projects/GooCanvas";
+    license = licenses.lgpl2; # https://gitlab.gnome.org/GNOME/goocanvas/-/issues/12
+    maintainers = with maintainers; [ bobby285271 ];
+    platforms = platforms.unix;
+  };
+}
--- a/pkgs/development/libraries/gtkextra/default.nix
+++ b/pkgs/development/libraries/gtkextra/default.nix
@ -0,0 +1,42 @@
+{ stdenv
+, lib
+, fetchurl
+, pkg-config
+, gobject-introspection
+, file
+, gtk2
+, glib
+, cairo
+, atk
+, pango
+, libtiff
+, libpng
+, libjpeg
+}:
+
+stdenv.mkDerivation rec {
+  pname = "gtkextra";
+  version = "3.3.4";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/gtkextra/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
+    sha256 = "1mpihbyzhv3ymfim93l9xnxmzhwyqdba5xb4rdn5vggdg25766v5";
+  };
+
+  postPatch = ''
+    substituteInPlace configure \
+      --replace "/usr/bin/file" "${file}/bin/file"
+  '';
+
+  nativeBuildInputs = [ gobject-introspection pkg-config ];
+
+  buildInputs = [ gtk2 glib cairo atk pango libtiff libpng libjpeg ];
+
+  meta = with lib; {
+    homepage = "http://gtkextra.sourceforge.net/";
+    description = "GtkExtra is a useful set of widgets for creating GUI's for GTK+.";
+    license = licenses.lgpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ tesq0 ];
+  };
+}
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@ -263,6 +263,7 @@
 , "uglify-js"
 , "undollar"
 , "ungit"
+, "unified-language-server"
 , "vega-cli"
 , "vega-lite"
 , "vim-language-server"
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
--- a/pkgs/development/python-modules/deemix/default.nix
+++ b/pkgs/development/python-modules/deemix/default.nix
@ -0,0 +1,49 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, spotipy
+, click
+, pycryptodomex
+, mutagen
+, requests
+, deezer-py
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "deemix";
+  version = "3.4.1";
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-FGzMFJOoKQPNq4tGI1KsMO+i9iBZhoz5Z67BFLEuv48=";
+  };
+
+  propagatedBuildInputs = [
+    spotipy
+    click
+    pycryptodomex
+    mutagen
+    requests
+    deezer-py
+  ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [
+    "spotipy"
+    "click"
+    "Cryptodome"
+    "mutagen"
+    "requests"
+    "deezer"
+  ];
+
+  meta = with lib; {
+    homepage = "https://git.freezer.life/RemixDev/deemix-py";
+    description = "Deezer downloader built from the ashes of Deezloader Remix";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ natto1784 ];
+  };
+}
--- a/pkgs/development/python-modules/deezer-py/default.nix
+++ b/pkgs/development/python-modules/deezer-py/default.nix
@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "deezer-py";
+  version = "1.1.1";
+  disabled = pythonOlder "3.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-EAiGMSLrRsF03FMLkizy3Fm+nAldSTxe9KdXFFep0iQ=";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "requests" ];
+
+  meta = with lib; {
+    homepage = "https://gitlab.com/RemixDev/deezer-py";
+    description = "A wrapper for all Deezer's APIs";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ natto1784 ];
+  };
+}
--- a/pkgs/development/python-modules/solc-select/default.nix
+++ b/pkgs/development/python-modules/solc-select/default.nix
@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "solc-select";
+  version = "0.2.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-6VawTcffIgnR+zuC4rti+Ocwu1VMTX+VihT/L7LzchI=";
+  };
+
+  # no tests
+  doCheck = false;
+  pythonImportsCheck = [ "solc_select" ];
+
+  meta = with lib; {
+    description = "Manage and switch between Solidity compiler versions";
+    homepage = "https://github.com/crytic/solc-select";
+    license = licenses.agpl3Plus;
+    maintainers = with maintainers; [ arturcygan ];
+  };
+}
--- a/pkgs/development/python-modules/yalesmartalarmclient/default.nix
+++ b/pkgs/development/python-modules/yalesmartalarmclient/default.nix
@ -7,13 +7,13 @@

 buildPythonPackage rec {
  pname = "yalesmartalarmclient";
-  version = "0.3.4";
+  version = "0.3.5";

  src = fetchFromGitHub {
    owner = "domwillcode";
    repo = "yale-smart-alarm-client";
    rev = "v${version}";
-    sha256 = "sha256-waWi3QnH7xQZh5iYklISCvfAaBdH5k+Y10huZuTNlSc=";
+    sha256 = "11i7vh61a5xfv32zm7rkigl010wzd6snag6sf7w38256j95nnb05";
  };

  propagatedBuildInputs = [
@ -23,6 +23,7 @@ buildPythonPackage rec {

  # Project has no tests
  doCheck = false;
+
  pythonImportsCheck = [ "yalesmartalarmclient" ];

  meta = with lib; {
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "zeroconf";
-  version = "0.32.1";
+  version = "0.33.2";
  format = "setuptools";
  disabled = pythonOlder "3.6";

@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "jstasiak";
    repo = "python-zeroconf";
    rev = version;
-    sha256 = "02fvh5ii73rf6pg9x93pc0sl1isx2ivg3d80l6s8h35w2f4g4azf";
+    sha256 = "0pcfglxvrd3n6b5hkn169p38flhqr7alj8ipxx1p7kphywywplif";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/tools/fnlfmt/default.nix
+++ b/pkgs/development/tools/fnlfmt/default.nix
@ -0,0 +1,41 @@
+{ lib, stdenv, fetchFromSourcehut, fennel, lua }:
+
+stdenv.mkDerivation rec {
+  pname = "fnlfmt";
+  version = "0.2.1";
+
+  src = fetchFromSourcehut {
+    owner = "~technomancy";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-JIqeQhI3fFGrej2wbj6/367IZqWAFegySc2R8IDmvGE=";
+  };
+
+  nativeBuildInputs = [ fennel ];
+
+  buildInputs = [ lua ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    echo "#!${lua}/bin/lua" > fnlfmt
+    ${fennel}/bin/fennel --require-as-include --compile cli.fnl >> fnlfmt
+    chmod +x fnlfmt
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -D ./fnlfmt $out/bin/fnlfmt
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Formatter for Fennel";
+    homepage = "https://git.sr.ht/~technomancy/fnlfmt";
+    license = licenses.lgpl3Plus;
+    platforms = lua.meta.platforms;
+    maintainers = [ maintainers.gpanders ];
+  };
+}
--- a/pkgs/development/tools/misc/apio/default.nix
+++ b/pkgs/development/tools/misc/apio/default.nix
@ -14,14 +14,14 @@

 buildPythonApplication rec {
  pname = "apio";
-  version = "0.7.5";
+  version = "0.7.6";
  format = "flit";

  src = fetchFromGitHub {
    owner = "FPGAwars";
    repo = "apio";
    rev = "v${version}";
-    sha256 = "sha256-9f0q6tELUDo6FdjPG708d7BY3O5ZiZ0FwNFzBBiLQp4=";
+    sha256 = "sha256-KmqxwYKsvcTSuUSVXgegR47y9VeU/vICbYWD7z3aDRM=";
  };

  postPatch = ''
--- a/pkgs/development/tools/roswell/0001-get-image-from-environment.patch
+++ b/pkgs/development/tools/roswell/0001-get-image-from-environment.patch
@ -0,0 +1,25 @@
+From 40c81f684ec2014ea63a712329f61c52aebe4dba Mon Sep 17 00:00:00 2001
+From: Valentin Boettcher <hiro@protagon.space>
+Date: Wed, 4 Aug 2021 17:25:12 +0200
+Subject: [PATCH] get image from environment
+
+---
+ src/cmd-run-sbcl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cmd-run-sbcl.c b/src/cmd-run-sbcl.c
+index a83b56c..dc472bb 100644
+--- a/src/cmd-run-sbcl.c
+++ b/src/cmd-run-sbcl.c
+@@ -12,7 +12,7 @@ char** cmd_run_sbcl(int argc,char** argv,struct sub_command* cmd) {
+   char* impl_path=impldir(arch,os,impl,version);
+   char* help=get_opt("help",0);
+   char* script=get_opt("script",0);
+-  char* image=get_opt("image",0);
+  char* image=get_opt("image",1);
+   char* program=get_opt("program",0);
+   char* dynamic_space_size=get_opt("dynamic-space-size",1);
+   char* control_stack_size=get_opt("control-stack-size",1);
+-- 
+2.32.0
+
--- a/pkgs/development/tools/roswell/default.nix
+++ b/pkgs/development/tools/roswell/default.nix
@ -2,15 +2,22 @@

 stdenv.mkDerivation rec {
  pname = "roswell";
-  version = "21.01.14.108";
+  version = "21.06.14.110";

  src = fetchFromGitHub {
    owner = "roswell";
    repo = pname;
    rev = "v${version}";
-    sha256 = "1hj9q3ig7naky3pb3jkl9yjc9xkg0k7js3glxicv0aqffx9hkp3p";
+    sha256 = "18hxhz7skxvzabz5z0yjky4f3fsyfanafh0imkn5macp8aw3wsfm";
  };

+  patches = [
+    # Load the name of the image from the environment variable so that
+    # it can be consistently overwritten. Using the command line
+    # argument in the wrapper did not work.
+    ./0001-get-image-from-environment.patch
+  ];
+
  preConfigure = ''
    sh bootstrap
  '';
@ -19,7 +26,8 @@ stdenv.mkDerivation rec {

  postInstall = ''
    wrapProgram $out/bin/ros \
-      --add-flags 'lisp=sbcl-bin/system sbcl-bin.version=system' \
+      --set image `basename $out` \
+      --add-flags 'lisp=sbcl-bin/system sbcl-bin.version=system -L sbcl-bin' \
      --prefix PATH : ${lib.makeBinPath [ sbcl ]} --argv0 ros
  '';

--- a/pkgs/development/tools/unityhub/default.nix
+++ b/pkgs/development/tools/unityhub/default.nix
@ -2,8 +2,14 @@

 let
  version = "2.3.2";
-in appimageTools.wrapType2 rec {
+  src = fetchurl {
+    # mirror of https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage
+    url = "https://archive.org/download/unity-hub-${version}/UnityHub.AppImage";
+    sha256 = "07nfyfp9apshqarc6pgshsczila6x4943hiyyizc55kp85aw0imn";
+  };
  name = "unityhub";
+in appimageTools.wrapType2 rec {
+  inherit name src;

  extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk-pixbuf glib libGL libGLU nss nspr
    alsa-lib cups gnome2.GConf libcap fontconfig freetype pango
@ -16,16 +22,20 @@ in appimageTools.wrapType2 rec {
    libselinux pciutils libpulseaudio libxml2 icu clang cacert
  ]);

+  extraInstallCommands =
+    let appimageContents = appimageTools.extractType2 { inherit name src; }; in
+    ''
+      install -Dm444 ${appimageContents}/unityhub.desktop -t $out/share/applications
+      substituteInPlace $out/share/applications/unityhub.desktop \
+        --replace 'Exec=AppRun' 'Exec=${name}'
+      install -m 444 -D ${appimageContents}/unityhub.png \
+        $out/share/icons/hicolor/64x64/apps/unityhub.png
+    '';
+
  profile = ''
    export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
  '';

-  src = fetchurl {
-    # mirror of https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage
-    url = "https://archive.org/download/unity-hub-${version}/UnityHub.AppImage";
-    sha256 = "07nfyfp9apshqarc6pgshsczila6x4943hiyyizc55kp85aw0imn";
-  };
-
  meta = with lib; {
    homepage = "https://unity3d.com/";
    description = "Game development tool";
--- a/pkgs/os-specific/linux/s6-linux-init/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-init/default.nix
@ -4,8 +4,8 @@ with skawarePackages;

 buildPackage {
  pname = "s6-linux-init";
-  version = "1.0.6.2";
-  sha256 = "06xcmn2a89fvng056lcnnyrl2ak0y7cblkc90lj9a2liyhawy9dr";
+  version = "1.0.6.3";
+  sha256 = "1idqjcxhl5wgff8yrsvx2812wahjri2hcs7qs6k62g0sdd8niqr9";

  description = "A set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel";
  platforms = lib.platforms.linux;
--- a/pkgs/servers/dict/dictd-db-collector.nix
+++ b/pkgs/servers/dict/dictd-db-collector.nix
@ -78,5 +78,6 @@ stdenv.mkDerivation {

  buildInputs = [ dict ];

+  dontUnpack = true;
  inherit installPhase;
 })
--- a/pkgs/tools/misc/dust/default.nix
+++ b/pkgs/tools/misc/dust/default.nix
@ -2,13 +2,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "du-dust";
-  version = "0.6.1";
+  version = "0.6.2";

  src = fetchFromGitHub {
    owner = "bootandy";
    repo = "dust";
    rev = "v${version}";
-    sha256 = "sha256-SgTEawxuz9gRxSZ9edNz2NwfJWSAwxKXxDJVpU6oTBg=";
+    sha256 = "sha256-5GhoL3by4sXhFJrNZi/UlERBa+s2oqDVVJODY0kdfxI=";
    # Remove unicode file names which leads to different checksums on HFS+
    # vs. other filesystems because of unicode normalisation.
    extraPostFetch = ''
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
    '';
  };

-  cargoSha256 = "sha256-/kDF1ZOzu32Dwd5fWZGhMlEf65TAKLMPFu+ZnZxOAms=";
+  cargoSha256 = "sha256-cgH3jrZPGUHiBDeJ9qj80dU+Vbz+wHMOsCaGAvJY6mg=";

  doCheck = false;

--- a/pkgs/tools/misc/mathpix-snipping-tool/default.nix
+++ b/pkgs/tools/misc/mathpix-snipping-tool/default.nix
@ -1,12 +1,12 @@
 { appimageTools, lib, fetchurl }:
 let
  pname = "mathpix-snipping-tool";
-  version = "03.00.0025";
+  version = "03.00.0050";
  name = "${pname}-${version}";

  src = fetchurl {
    url = "https://download.mathpix.com/linux/Mathpix_Snipping_Tool-x86_64.v${version}.AppImage";
-    sha256 = "0p39rsmjfz3m5s3k9pmmkqbp8f21s1cwjgspz8m47dq5jjls8ay8";
+    sha256 = "0bf4x6jffiqdss8vwy1qypv75zxi1bfc8rywsgp5qlsjq792plpb";
  };

  appimageContents = appimageTools.extract { inherit name src; };
--- a/pkgs/tools/misc/szyszka/default.nix
+++ b/pkgs/tools/misc/szyszka/default.nix
@ -0,0 +1,45 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, glib
+, cairo
+, pango
+, atk
+, gdk-pixbuf
+, gtk3
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "szyszka";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "qarmin";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-TQwDvkWWlk09kVVaVI56isJi+X9UXWnoz+2PVyK9BGc=";
+  };
+
+  cargoSha256 = "sha256-2uyMA2nIOPkc5+qImFn3eUVq2AxHu3Xj91TpkKswjao=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    glib
+    cairo
+    pango
+    atk
+    gdk-pixbuf
+    gtk3
+  ];
+
+  meta = with lib; {
+    description = "A simple but powerful and fast bulk file renamer";
+    homepage = "https://github.com/qarmin/szyszka";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ kranzes ];
+  };
+}
--- a/pkgs/tools/networking/dnschef/default.nix
+++ b/pkgs/tools/networking/dnschef/default.nix
@ -0,0 +1,27 @@
+{ buildPythonApplication, fetchFromGitHub, dnslib, lib }:
+
+buildPythonApplication rec {
+  pname = "dnschef";
+  version = "0.4";
+
+  src = fetchFromGitHub {
+    owner = "iphelix";
+    repo = "dnschef";
+    rev = "a395411ae1f5c262d0b80d06a45a445f696f3243";
+    sha256 = "0ll3hw6w5zhzyqc2p3c9443gcp12sx6ddybg5rjpl01dh3svrk1q";
+  };
+
+  format = "other";
+  installPhase = ''
+    install -D ./dnschef.py $out/bin/dnschef
+  '';
+
+  propagatedBuildInputs = [ dnslib ];
+
+  meta = with lib; {
+    homepage = "https://github.com/iphelix/dnschef";
+    description = "Highly configurable DNS proxy for penetration testers and malware analysts";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.gfrascadorio ];
+  };
+}
--- a/pkgs/tools/security/echidna/default.nix
+++ b/pkgs/tools/security/echidna/default.nix
@ -0,0 +1,62 @@
+{ lib
+, fetchpatch
+, fetchFromGitHub
+# Haskell deps
+, mkDerivation, aeson, ansi-terminal, base, base16-bytestring, binary, brick
+, bytestring, cborg, containers, data-dword, data-has, deepseq, directory
+, exceptions, filepath, hashable, hevm, hpack, lens, lens-aeson, megaparsec
+, MonadRandom, mtl, optparse-applicative, process, random, stm, tasty
+, tasty-hunit, tasty-quickcheck, temporary, text, transformers , unix, unliftio
+, unliftio-core, unordered-containers, vector, vector-instances, vty
+, wl-pprint-annotated, word8, yaml , extra, ListLike, semver
+}:
+mkDerivation rec {
+  pname = "echidna";
+  version = "1.7.2";
+
+  src = fetchFromGitHub {
+    owner = "crytic";
+    repo = "echidna";
+    rev = "v${version}";
+    sha256 = "sha256-eFhL8Zn8204JRrF69ibPtd7VpFW63i1iVXoGwXHlqps=";
+  };
+
+  patches = [
+    (fetchpatch {
+      name = "update-hevm-to-0.47.0.patch";
+      url = "https://github.com/crytic/echidna/commit/25dfdad93d0e0dd822f22a1c1e63a0ecf2b22a23.patch";
+      sha256 = "sha256-dj3Ie+Z4zE1fgROE/KuWZXaH9knsXJi1ai3gu5zyw/E=";
+    })
+  ];
+
+  isLibrary = true;
+  isExecutable = true;
+  libraryHaskellDepends = [
+    aeson ansi-terminal base base16-bytestring binary brick bytestring cborg
+    containers data-dword data-has deepseq directory exceptions filepath
+    hashable hevm lens lens-aeson megaparsec MonadRandom mtl
+    optparse-applicative process random stm temporary text transformers unix
+    unliftio unliftio-core unordered-containers vector vector-instances vty
+    wl-pprint-annotated word8 yaml extra ListLike semver
+  ];
+  libraryToolDepends = [ hpack ];
+  executableHaskellDepends = libraryHaskellDepends;
+  testHaskellDepends = [
+    tasty tasty-hunit tasty-quickcheck
+  ];
+  preConfigure = ''
+    hpack
+    # re-enable dynamic build for Linux
+    sed -i -e 's/os(linux)/false/' echidna.cabal
+  '';
+  shellHook = "hpack";
+  doHaddock = false;
+  # tests depend on a specific version of solc
+  doCheck = false;
+
+  description = "Ethereum smart contract fuzzer";
+  homepage = "https://github.com/crytic/echidna";
+  license = lib.licenses.agpl3Plus;
+  maintainers = with lib.maintainers; [ arturcygan ];
+  platforms = lib.platforms.unix;
+}
--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "exploitdb";
-  version = "2021-08-04";
+  version = "2021-08-05";

  src = fetchFromGitHub {
    owner = "offensive-security";
    repo = pname;
    rev = version;
-    sha256 = "sha256-DJg/pBTK2abo3eemt8XI4ecy7sZ8iH/qrJgUqrDNjjQ=";
+    sha256 = "sha256-on70ulr8B883Ty7ctmB9d8bLhK+83Qo2UqwIIrA7fkE=";
  };

  installPhase = ''
--- a/pkgs/tools/security/prs/default.nix
+++ b/pkgs/tools/security/prs/default.nix
@ -9,20 +9,21 @@
 , gpgme
 , gtk3
 , libxcb
+, libxkbcommon
 }:

 rustPlatform.buildRustPackage rec {
  pname = "prs";
-  version = "0.2.11";
+  version = "0.2.13";

  src = fetchFromGitLab {
    owner = "timvisee";
    repo = "prs";
    rev = "v${version}";
-    sha256 = "sha256-jBHe3ZeB+GS+Ds8c6ySwoyyJfqoCWKSgIObg+z1TNmU=";
+    sha256 = "sha256-UZm147oNBbgagGKgJcaT5354Tl+MXkK+/bB+tuncH5o=";
  };

-  cargoSha256 = "sha256-dhQuzzML817cDIsYuZElHZfq55AdZ20xeXTNm1nJPqk=";
+  cargoSha256 = "sha256-u31xzgZVlXbraq2lTRJCKZVoHqRg8iH2kE3tkq5NwLk=";

  postPatch = ''
    # The GPGME backend is recommended
@ -34,7 +35,14 @@ rustPlatform.buildRustPackage rec {

  nativeBuildInputs = [ gpgme installShellFiles pkg-config python3 ];

-  buildInputs = [ dbus glib gpgme gtk3 libxcb ];
+  buildInputs = [
+    dbus
+    glib
+    gpgme
+    gtk3
+    libxcb
+    libxkbcommon
+  ];

  postInstall = ''
    for shell in bash fish zsh; do
--- a/pkgs/tools/system/acpica-tools/default.nix
+++ b/pkgs/tools/system/acpica-tools/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "acpica-tools";
-  version = "20200430";
+  version = "20210730";

  src = fetchurl {
    url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
-    sha256 = "0z19bniqsa8y0n1qrxmb6gz7m63jpwx22zgk5ablyriixhfpz07v";
+    sha256 = "1pmm977nyl3bs71ipzcl4dh30qm8x9wm2p2ml0m62rl62kai832a";
  };

  NIX_CFLAGS_COMPILE = "-O3";
@ -16,9 +16,10 @@ stdenv.mkDerivation rec {
  buildFlags = [
    "acpibin"
    "acpidump"
+    "acpiexamples"
    "acpiexec"
    "acpihelp"
-    "acpinames"
+    "acpisrc"
    "acpixtract"
  ];

@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "ACPICA Tools";
    homepage = "https://www.acpica.org/";
-    license = with licenses; [ gpl2 bsd3 ];
+    license = with licenses; [ iasl gpl2Only bsd3 ];
    platforms = platforms.linux;
    maintainers = with maintainers; [ tadfisher ];
  };
--- a/pkgs/tools/text/ispell/default.nix
+++ b/pkgs/tools/text/ispell/default.nix
@ -6,25 +6,11 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "http://fmg-www.cs.ucla.edu/geoff/tars/${pname}-${version}.tar.gz";
-    sha256 = "1d7c2fqrdjckp91ajpkn5nnmpci2qrxqn8b6cyl0zn1afb9amxbz";
+    sha256 = "1hmfnz55qzfpz7lz0r3m4kkv31smir92ks9s5l1iiwimhr2jxi2x";
  };

  buildInputs = [ bison ncurses ];

-  patches = [
-    ./patches/0007-Use-termios.patch
-    ./patches/0008-Tex-backslash.patch
-    ./patches/0009-Fix-FTBFS-on-glibc.patch
-    ./patches/0011-Missing-prototypes.patch
-    ./patches/0012-Fix-getline.patch
-    ./patches/0013-Fix-man-pages.patch
-    ./patches/0021-Fix-gcc-warnings.patch
-    ./patches/0023-Exclusive-options.patch
-    ./patches/0024-Check-tempdir-creation.patch
-    ./patches/0025-Languages.patch
-    ./patches/0030-Display-whole-multibyte-character.patch
-  ];
-
  postPatch = ''
    cat >> local.h <<EOF
    ${lib.optionalString (!stdenv.isDarwin) "#define USG"}
@ -43,12 +29,6 @@ stdenv.mkDerivation rec {
    EOF
  '';

-  preBuild = ''
-    for dir in $out/share/emacs/site-lisp $out/share/info $out/share/man/man1 $out/share/man/man4 $out/bin $out/lib; do
-    mkdir -p $dir
-    done
-  '';
-
  meta = with lib; {
    description = "An interactive spell-checking program for Unix";
    homepage = "https://www.cs.hmc.edu/~geoff/ispell.html";
--- a/pkgs/tools/text/ispell/patches/0007-Use-termios.patch
+++ b/pkgs/tools/text/ispell/patches/0007-Use-termios.patch
@ -1,188 +0,0 @@
-From: Torsten Landschoff <t.landschoff@gmx.net>
-Date: Tue, 30 Mar 1999 21:05:09 +0100
-Subject: 0007 Use termios
-
-Use termios instead of termio (Closes: #35288).
-
-Patch updated on Mon, 07 Mar 2011 20:40:53 +0100 based on
-ispell-3.3.02-terminal.patch from ispell-3.3.02-102.1.src.rpm
---
- term.c |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 58 insertions(+), 0 deletions(-)
-
-diff --git a/term.c b/term.c
-index 4923844..47c1aa0 100644
--- a/term.c
-+++ b/term.c
-@@ -87,13 +87,22 @@ static char Rcs_Id[] =
- #include "proto.h"
- #include "msgs.h"
- #ifdef USG
-+#if defined(__GLIBC__) && __GLIBC__ >= 2
-+/* Use termios under at least glibc */
-+  #include <termios.h>
-+  #define USE_TERMIOS
-+#else
- #include <termio.h>
-+#endif
- #else
- #ifndef __DJGPP__
- #include <sgtty.h>
- #endif
- #endif
- #include <signal.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <sys/wait.h>
- 
- void		ierase P ((void));
- void		imove P ((int row, int col));
-@@ -166,8 +175,13 @@ static int iputch (c)
-     }
- 
- #ifdef USG
-+#ifdef USE_TERMIOS
-+static struct termios	sbuf;
-+static struct termios	osbuf;
-+#else
- static struct termio	sbuf;
- static struct termio	osbuf;
-+#endif
- #else
- static struct sgttyb	sbuf;
- static struct sgttyb	osbuf;
-@@ -190,9 +204,13 @@ void terminit ()
-     int			tpgrp;
- #else
- #ifdef TIOCGPGRP
-+#ifdef USE_TERMIOS
-+    pid_t		tpgrp;
-+#else
-     int			tpgrp;
- #endif
- #endif
-+#endif
- #ifdef TIOCGWINSZ
-     struct winsize	wsize;
- #endif /* TIOCGWINSZ */
-@@ -276,7 +294,11 @@ retry:
- 	(void) fprintf (stderr, TERM_C_NO_BATCH);
- 	exit (1);
- 	}
-+#ifdef USE_TERMIOS
-+    (void) tcgetattr (0, &osbuf);
-+#else
-     (void) ioctl (0, TCGETA, (char *) &osbuf);
-+#endif
-     termchanged = 1;
- 
-     sbuf = osbuf;
-@@ -285,7 +307,11 @@ retry:
-     sbuf.c_iflag &= ~(INLCR | IGNCR | ICRNL);
-     sbuf.c_cc[VMIN] = 1;
-     sbuf.c_cc[VTIME] = 1;
-+#ifdef USE_TERMIOS
-+    (void) tcsetattr (0, TCSADRAIN, &sbuf);
-+#else
-     (void) ioctl (0, TCSETAW, (char *) &sbuf);
-+#endif
- 
-     uerasechar = osbuf.c_cc[VERASE];
-     ukillchar = osbuf.c_cc[VKILL];
-@@ -298,7 +324,11 @@ retry:
- #endif
- #endif
- #ifdef TIOCGPGRP
-+#ifdef USE_TERMIOS
-+    if ((tpgrp = tcgetpgrp (0)) == -1)
-+#else
-     if (ioctl (0, TIOCGPGRP, (char *) &tpgrp) != 0)
-+#endif
- 	{
- 	(void) fprintf (stderr, TERM_C_NO_BATCH);
- 	exit (1);
-@@ -373,7 +403,11 @@ SIGNAL_TYPE done (signo)
- 	if (te)
- 	    tputs (te, 1, iputch);
- #ifdef USG
-+#ifdef USE_TERMIOS
-+	(void) tcsetattr (0, TCSADRAIN, &osbuf);
-+#else
- 	(void) ioctl (0, TCSETAW, (char *) &osbuf);
-+#endif
- #else
- 	(void) ioctl (0, TIOCSETP, (char *) &osbuf);
- #ifdef TIOCSLTC
-@@ -394,7 +428,11 @@ static SIGNAL_TYPE onstop (signo)
- 	if (te)
- 	    tputs (te, 1, iputch);
- #ifdef USG
-+#ifdef USE_TERMIOS
-+    (void) tcsetattr (0, TCSANOW, &osbuf); /* OpenSuse: TCSADRAIN */
-+#else
- 	(void) ioctl (0, TCSETAW, (char *) &osbuf);
-+#endif
- #else
- 	(void) ioctl (0, TIOCSETP, (char *) &osbuf);
- #ifdef TIOCSLTC
-@@ -413,7 +451,11 @@ static SIGNAL_TYPE onstop (signo)
-     if (termchanged)
- 	{
- #ifdef USG
-+#ifdef USE_TERMIOS
-+    (void) tcsetattr (0, TCSANOW, &sbuf);
-+#else
- 	(void) ioctl (0, TCSETAW, (char *) &sbuf);
-+#endif
- #else
- 	(void) ioctl (0, TIOCSETP, (char *) &sbuf);
- #ifdef TIOCSLTC
-@@ -481,7 +523,11 @@ int shellescape	(buf)
-     argv[i] = NULL;
- 
- #ifdef USG
-+#ifdef USE_TERMIOS
-+    (void) tcsetattr (0, TCSADRAIN, &osbuf);
-+#else
-     (void) ioctl (0, TCSETAW, (char *) &osbuf);
-+#endif
- #else
-     (void) ioctl (0, TIOCSETP, (char *) &osbuf);
- #ifdef TIOCSLTC
-@@ -527,7 +573,11 @@ int shellescape	(buf)
- #endif
- 
- #ifdef USG
-+#ifdef USE_TERMIOS
-+    (void) tcsetattr (0, TCSADRAIN, &sbuf);
-+#else
-     (void) ioctl (0, TCSETAW, (char *) &sbuf);
-+#endif
- #else
-     (void) ioctl (0, TIOCSETP, (char *) &sbuf);
- #ifdef TIOCSLTC
-@@ -563,7 +613,11 @@ void shescape (buf)
- #endif
- 
- #ifdef USG
-+#ifdef USE_TERMIOS
-+    (void) tcsetattr (0, TCSADRAIN, &osbuf);
-+#else
-     (void) ioctl (0, TCSETAW, (char *) &osbuf);
-+#endif
- #else
-     (void) ioctl (0, TIOCSETP, (char *) &osbuf);
- #ifdef TIOCSLTC
-@@ -611,7 +665,11 @@ void shescape (buf)
- #endif
- 
- #ifdef USG
-+#ifdef USE_TERMIOS
-+    (void) tcsetattr (0, TCSADRAIN, &sbuf);
-+#else
-     (void) ioctl (0, TCSETAW, (char *) &sbuf);
-+#endif
- #else
-     (void) ioctl (0, TIOCSETP, (char *) &sbuf);
- #ifdef TIOCSLTC
-- 
--- a/pkgs/tools/text/ispell/patches/0008-Tex-backslash.patch
+++ b/pkgs/tools/text/ispell/patches/0008-Tex-backslash.patch
@ -1,48 +0,0 @@
-From: Ken Stevens <kstevens@ece.utah.edu>
-Date: Sat, 15 Jul 2000 22:10:53 -0400
-Subject: 0008 Tex backslash
-
-Version 3.1.20 contains an irritating bug when using latex that causes all
-sorts of problems when the backslash is used. (The backslash is a common
-character in latex that is used, among other things, to create a forced space
-similar to the tilde character.) In the current version, 3.1.20, the next TWO
-characters are skipped after a backslash. This can results in misspellings and
-the file being incorrectly parsed. (For example, if the text contains the
-sequence `\ $' math mode will not be entered until the matching $ which should
-end it, resulting in the body of the text not being spell checked and the math
-region being checked.)
-
-Make sure to undefine NO8BIT and use a larger number for MASKBITS if you are
-using iso character sets.
-
-http://www.kdstevens.com/~stevens/ispell-faq.html#bslash
---
- defmt.c |    7 +++----
- 1 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/defmt.c b/defmt.c
-index 35f93e4..7499752 100644
--- a/defmt.c
-+++ b/defmt.c
-@@ -884,6 +884,8 @@ static int TeX_math_end (bufp)
- 	return 0;
-     }
- 
-+/* Updates bufp to point to the next character to skip. */
-+/*  Should only be called on non-word characters. */
- static int TeX_math_begin (bufp)
-     unsigned char **	bufp;
-     {
-@@ -902,10 +904,7 @@ static int TeX_math_begin (bufp)
- 	if (**bufp == TEXLEFTPAREN  ||  **bufp == TEXLEFTSQUARE)
- 	    return 1;
- 	else if (!isalpha(**bufp)  &&  **bufp != '@')
-	    {
-	    (*bufp)++;
-	    continue;
-	    }
-+	    return 0;
- 	else if (TeX_strncmp (*bufp, "begin", 5) == 0)
- 	    {
- 	    if (TeX_math_check ('b', bufp))
-- 
--- a/pkgs/tools/text/ispell/patches/0009-Fix-FTBFS-on-glibc.patch
+++ b/pkgs/tools/text/ispell/patches/0009-Fix-FTBFS-on-glibc.patch
@ -1,23 +0,0 @@
-From: Richard Braakman <dark@dark.wapit.fi>
-Date: Fri, 2 Feb 2001 17:22:53 +0200
-Subject: 0009 Fix FTBFS on glibc
-
-Fix FTBFS on glibc (Closes: #75377)
---
- config.X |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/config.X b/config.X
-index 18bf621..0a47cb2 100644
--- a/config.X
-+++ b/config.X
-@@ -531,7 +531,7 @@
- #endif /* NO_MKSTEMP */
- 
- /* Aliases for some routines */
-#ifdef USG
-+#if defined (USG) && !defined(__GLIBC__)
- #define BCOPY(s, d, n)	memcpy (d, s, n)
- #define BZERO(d, n)	memset (d, 0, n)
- #define index strchr
-- 
--- a/pkgs/tools/text/ispell/patches/0011-Missing-prototypes.patch
+++ b/pkgs/tools/text/ispell/patches/0011-Missing-prototypes.patch
@ -1,84 +0,0 @@
-From: Doug Porter <dsp@debian.org>
-Date: Tue, 22 Jan 2002 10:28:44 -0500
-Subject: 0011 Missing prototypes
-
-Fixing implicit declarations (Closes: #130405).
---
- correct.c |    1 +
- ijoin.c   |    2 +-
- ispell.c  |    2 ++
- lookup.c  |    2 ++
- tree.c    |    1 +
- 5 files changed, 7 insertions(+), 1 deletions(-)
-
-diff --git a/correct.c b/correct.c
-index e2b63c8..661bf57 100644
--- a/correct.c
-+++ b/correct.c
-@@ -201,6 +201,7 @@ static char Rcs_Id[] =
-  */
- 
- #include <ctype.h>
-+#include <unistd.h>
- #include "config.h"
- #include "ispell.h"
- #include "proto.h"
-diff --git a/ijoin.c b/ijoin.c
-index edb18d1..5da039a 100644
--- a/ijoin.c
-+++ b/ijoin.c
-@@ -115,6 +115,7 @@ static char Rcs_Id[] =
-  */
- 
- #include <stdio.h>
-+#include <string.h>
- #include "config.h"
- #include "ispell.h"
- #include "proto.h"
-@@ -169,7 +170,6 @@ static char *		tabchar = " \t"; /* Field separator character(s) */
- static int		unpairable1 = 0; /* NZ if -a1 */
- static int		unpairable2 = 0; /* NZ if -a2 */
- 
-extern int	strcmp ();
- 
- int main (argc, argv)			/* Join files */
-     int			argc;		/* Argument count */
-diff --git a/ispell.c b/ispell.c
-index 9b509d0..59fe358 100644
--- a/ispell.c
-+++ b/ispell.c
-@@ -235,6 +235,8 @@ static char Rcs_Id[] =
- #include <fcntl.h>
- #endif /* NO_FCNTL_H */
- #include <sys/stat.h>
-+#include <ctype.h>
-+#include <unistd.h>
- 
- static void	usage P ((void));
- int		main P ((int argc, char * argv[]));
-diff --git a/lookup.c b/lookup.c
-index 648f9c8..8bf1f6c 100644
--- a/lookup.c
-+++ b/lookup.c
-@@ -87,6 +87,8 @@ static char Rcs_Id[] =
- 
- #include <fcntl.h>
- 
-+#include <sys/types.h>
-+#include <unistd.h>
- #include "config.h"
- #include "ispell.h"
- #include "proto.h"
-diff --git a/tree.c b/tree.c
-index 073a6a6..c26f635 100644
--- a/tree.c
-+++ b/tree.c
-@@ -94,6 +94,7 @@ static char Rcs_Id[] =
- 
- #include <ctype.h>
- #include <errno.h>
-+#include <unistd.h>
- #include "config.h"
- #include "ispell.h"
- #include "proto.h"
-- 
--- a/pkgs/tools/text/ispell/patches/0012-Fix-getline.patch
+++ b/pkgs/tools/text/ispell/patches/0012-Fix-getline.patch
@ -1,62 +0,0 @@
-From: Stefan Potyra <sistpoty@ubuntu.com>
-Date: Sat, 3 Oct 2009 04:00:34 +0200
-Subject: 0012 Fix getline
-
-getline is not provided by eglibc, avoid conflict
-
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549401
-Forwarded: no
---
- correct.c |   10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/correct.c b/correct.c
-index 661bf57..ff7cb99 100644
--- a/correct.c
-+++ b/correct.c
-@@ -246,7 +246,7 @@ static void	save_root_cap P ((ichar_t * word, ichar_t * pattern,
- 		  struct flagent * sufent,
- 		  ichar_t savearea[MAX_CAPS][INPUTWORDLEN + MAXAFFIXLEN],
- 		  int * nsaved));
-static char *	getline P ((char * buf, int bufsize));
-+static char *	getline_ispell P ((char * buf, int bufsize));
- void		askmode P ((void));
- void		copyout P ((unsigned char ** cc, int cnt));
- static void	lookharder P ((unsigned char * string));
-@@ -572,7 +572,7 @@ checkagain:
- 
- 		imove (li - 1, 0);
- 		(void) putchar ('!');
-		if (getline ((char *) buf, sizeof buf) == NULL)
-+		if (getline_ispell ((char *) buf, sizeof buf) == NULL)
- 		    {
- 		    (void) putchar (7);
- 		    ierase ();
-@@ -597,7 +597,7 @@ checkagain:
- 		    (void) printf ("%s ", CORR_C_READONLY);
- 		    }
- 		(void) printf (CORR_C_REPLACE_WITH);
-		if (getline ((char *) ctok, ctokl) == NULL)
-+		if (getline_ispell ((char *) ctok, ctokl) == NULL)
- 		    {
- 		    (void) putchar (7);
- 		    /* Put it back */
-@@ -665,7 +665,7 @@ checkagain:
- 		unsigned char	buf[100];
- 		imove (li - 1, 0);
- 		(void) printf (CORR_C_LOOKUP_PROMPT);
-		if (getline ((char *) buf, sizeof buf) == NULL)
-+		if (getline_ispell ((char *) buf, sizeof buf) == NULL)
- 		    {
- 		    (void) putchar (7);
- 		    ierase ();
-@@ -1584,7 +1584,7 @@ static void save_root_cap (word, pattern, prestrip, preadd, sufstrip, sufadd,
-     return;
-     }
- 
-static char * getline (s, len)
-+static char * getline_ispell(s, len)
-     register char *	s;
-     register int	len;
-     {
-- 
--- a/pkgs/tools/text/ispell/patches/0013-Fix-man-pages.patch
+++ b/pkgs/tools/text/ispell/patches/0013-Fix-man-pages.patch
@ -1,227 +0,0 @@
-From: David Paleino <d.paleino@gmail.com>
-Date: Mon, 9 Nov 2009 09:22:12 +0000
-Subject: 0013 Fix man pages
-
-Fix man pages, manpage-has-errors-from-man and hyphen-used-as-minus-sign
-
-Forwarded: no
---
- ispell.1X |   26 +++++++++++++-------------
- ispell.5X |   26 +++++++++++++-------------
- 2 files changed, 26 insertions(+), 26 deletions(-)
-
-diff --git a/ispell.1X b/ispell.1X
-index b27b120..79894d4 100644
--- a/ispell.1X
-+++ b/ispell.1X
-@@ -236,8 +236,8 @@ count affix-file
- .RB [ \-p | \-s]
- .RB [ \-c ]
- .I expanded-file
-.IR affix [ +addition ]
-...
-+.IR affix
-+.RI [ +addition ]
- .PP
- .B icombine
- .RB [ \-T
-@@ -336,7 +336,7 @@ The amount of context is subject to a system-imposed limit.
- If the
- .B \-V
- flag is given, characters that are not in the 7-bit ANSI printable
-character set will always be displayed in the style of "cat -v", even if
-+character set will always be displayed in the style of "cat \-v", even if
- .I ispell
- thinks that these characters are legal ISO Latin-1 on your system.
- This is useful when working with older terminals.
-@@ -542,7 +542,7 @@ option is used to specify an alternate hashed dictionary file,
- other than the default.
- If the filename does not contain a "/",
- the library directory for the default dictionary file is prefixed;
-thus, to use a dictionary in the local directory "-d ./xxx.hash" must
-+thus, to use a dictionary in the local directory "\-d ./xxx.hash" must
- be used.
- This is useful to allow dictionaries for alternate languages.
- Unlike previous versions of
-@@ -615,7 +615,7 @@ alphabetics have no meaning - alphabetics are already accepted.
- .I Ispell
- will typically be used with input from a file, meaning that preserving
- parity for possible 8 bit characters from the input text is OK.  If you
-specify the -l option, and actually type text from the terminal, this may
-+specify the \-l option, and actually type text from the terminal, this may
- create problems if your stty settings preserve parity.
- .PP
- It is not possible to use
-@@ -799,7 +799,7 @@ that the '&' is replaced by '?' (and the near-miss count is always zero).
- The suggested derivations following the near misses are in the form:
- .PP
- .RS
-[prefix+] root [-prefix] [-suffix] [+suffix]
-+[prefix+] root [\-prefix] [\-suffix] [+suffix]
- .RE
- .PP
- (e.g., "re+fry-y+ies" to get "refries")
-@@ -841,7 +841,7 @@ These output lines can be summarized as follows:
- .PP
- For example, a dummy dictionary containing the words "fray", "Frey",
- "fry", and "refried" might produce the following response to the
-command "echo 'frqy refries | ispell -a -m -d ./test.hash":
-+command "echo 'frqy refries | ispell \-a \-m \-d ./test.hash":
- .RS
- .nf
- (#) International Ispell Version 3.0.05 (beta), 08/10/91
-@@ -1036,7 +1036,7 @@ script does this.
- As an example, the command:
- .PP
- .RS
-echo BOTHER | ispell -c
-+echo BOTHER | ispell \-c
- .RE
- .PP
- produces:
-@@ -1055,7 +1055,7 @@ it expands affix flags to produce a list of words.
- For example, the command:
- .PP
- .RS
-echo BOTH/R | ispell -e
-+echo BOTH/R | ispell \-e
- .RE
- .PP
- produces:
-@@ -1268,7 +1268,7 @@ hash file if it were added to the language table.
- Only affixes that generate legal roots (found in the original input)
- are listed.
- .PP
-If the "-c" option is not given, the output lines are in the
-+If the "\-c" option is not given, the output lines are in the
- following format:
- .IP
- strip/add/count/bytes
-@@ -1298,7 +1298,7 @@ If the
- the output is made visually cleaner (but harder to post-process)
- by changing it to:
- .IP
--strip+add<tab>count<tab>bytes
-+\-strip+add<tab>count<tab>bytes
- .PP
- where
- .IR strip ,
-@@ -1313,7 +1313,7 @@ represents the ASCII tab character.
- The method used to generate possible affixes will also generate
- longer affixes which have common headers or trailers.  For example,
- the two words "moth" and "mother" will generate not only the obvious
-substitution "+er" but also "-h+her" and "-th+ther" (and possibly
-+substitution "+er" but also "\-h+her" and "\-th+ther" (and possibly
- even longer ones, depending on the value of
- .IR min ).
- To prevent
-@@ -1621,7 +1621,7 @@ redirected.
- However, a lot of the temporary space needed is for sorting, so TMPDIR
- is only a partial help on systems with an uncooperative
- .IR sort (1).
-("Cooperative" is defined as accepting the undocumented -T switch).
-+("Cooperative" is defined as accepting the undocumented \-T switch).
- At its peak usage,
- .I munchlist
- takes 10 to 40 times the original
-diff --git a/ispell.5X b/ispell.5X
-index ab526ed..7a1c2e5 100644
--- a/ispell.5X
-+++ b/ispell.5X
-@@ -137,8 +137,8 @@ This feature can be used to convert an entire dictionary if necessary:)
- 	echo qqqqq > dummy.dict
- 	buildhash dummy.dict \fIaffix-file\fP dummy.hash
- 	awk '{print "*"}END{print "#"}' \fIold-dict-file\fP \e
-	| ispell -a -T \fIold-dict-string-type\fP \e
-	  -d ./dummy.hash -p ./\fInew-dict-file\fP \e
-+	| ispell \-a \-T \fIold-dict-string-type\fP \e
-+	  \-d ./dummy.hash \-p ./\fInew-dict-file\fP \e
- 	  > /dev/null
- 	rm dummy.*
- .fi
-@@ -622,7 +622,7 @@ or
- .B stringchar
- statements.
- For example, if the hyphen is a boundary character (useful in French),
-the string "foo-bar" would be a single word, but "-foo" would be the
-+the string "foo-bar" would be a single word, but "\-foo" would be the
- same as "foo", and "foo--bar" would be two words separated by non-word
- characters.
- .PP
-@@ -916,7 +916,7 @@ The following (suffix) replacements:
- .RS
- .nf
- \&.	>	MENT
-Y	>	-Y,IES
-+Y	>	\-Y,IES
- .fi
- .RE
- .PP
-@@ -956,8 +956,8 @@ Instead, you must use two separate rules:
- .PP
- .RS
- .nf
-E	>	-E,IES
-Y	>	-Y,IES
-+E	>	\-E,IES
-+Y	>	\-Y,IES
- .fi
- .RE
- .PP
-@@ -1005,7 +1005,7 @@ For example, to specify words ending in "ED", write:
- .PP
- .RS
- .nf
-E D	>	-ED,ING		# As in covered > covering
-+E D	>	\-ED,ING		# As in covered > covering
- .fi
- .RE
- .PP
-@@ -1013,7 +1013,7 @@ If you write:
- .PP
- .RS
- .nf
-ED	>	-ED,ING
-+ED	>	\-ED,ING
- .fi
- .RE
- .PP
-@@ -1021,7 +1021,7 @@ the effect will be the same as:
- .PP
- .RS
- .nf
-[ED]	>	-ED,ING
-+[ED]	>	\-ED,ING
- .fi
- .RE
- .PP
-@@ -1047,7 +1047,7 @@ is useful, as in the following example:
- .PP
- .RS
- .nf
-$ munchlist -c oldaffixes -l newaffixes olddict > newdict
-+$ munchlist \-c oldaffixes \-l newaffixes olddict > newdict
- .fi
- .RE
- .PP
-@@ -1070,7 +1070,7 @@ flag from the English affix file:
- .RS
- .nf
- flag *S:
-    [^AEIOU]Y	>	-Y,IES	# As in imply > implies
-+    [^AEIOU]Y	>	\-Y,IES	# As in imply > implies
-     [AEIOU]Y	>	S		# As in convey > conveys
-     [SXZH]	>	ES		# As in fix > fixes
-     [^SXZHY]	>	S		# As in bat > bats
-@@ -1099,8 +1099,8 @@ For example, we could extend the English "R" flag as follows:
- flag *R:
-    E			>	R		# As in skate > skater
-    E			>	RS		# As in skate > skaters
-   [^AEIOU]Y	>	-Y,IER	# As in multiply > multiplier
-   [^AEIOU]Y	>	-Y,IERS	# As in multiply > multipliers
-+   [^AEIOU]Y	>	\-Y,IER	# As in multiply > multiplier
-+   [^AEIOU]Y	>	\-Y,IERS	# As in multiply > multipliers
-    [AEIOU]Y	>	ER		# As in convey > conveyer
-    [AEIOU]Y	>	ERS		# As in convey > conveyers
-    [^EY]		>	ER		# As in build > builder
-- 
--- a/pkgs/tools/text/ispell/patches/0021-Fix-gcc-warnings.patch
+++ b/pkgs/tools/text/ispell/patches/0021-Fix-gcc-warnings.patch
@ -1,57 +0,0 @@
-From: Robert Luberda <robert@debian.org>
-Date: Mon, 7 Mar 2011 22:23:56 +0100
-Subject: 0021 Fix gcc warnings
-
-Fix some gcc warnings.
---
- correct.c                |    2 +-
- languages/english/msgs.h |    8 ++++----
- tree.c                   |    2 +-
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/correct.c b/correct.c
-index 79b259f..982b7c6 100644
--- a/correct.c
-+++ b/correct.c
-@@ -825,7 +825,7 @@ static void inserttoken (buf, start, tok, curchar, oktochange)
- 	for (p = start;  p != *curchar;  p++)
- 	    (void) putc (*p, logfile);
- 	(void) putc (' ', logfile);
-	(void) fputs (tok, logfile);
-+	(void) fputs ((char*) tok, logfile);
- 	(void) putc ('\n', logfile);
- 	(void) fflush (logfile);
- 	}
-diff --git a/languages/english/msgs.h b/languages/english/msgs.h
-index d33b42b..f9c87ca 100644
--- a/languages/english/msgs.h
-+++ b/languages/english/msgs.h
-@@ -182,10 +182,10 @@
- #define CORR_C_HELP_4		"next to each one.  You have the option of replacing the word%s\n"
- #define CORR_C_HELP_5		"completely, or choosing one of the suggested words.%s\n"
-     /* You may add HELP_6 through HELP_9 if your language needs more lines */
-#define CORR_C_HELP_6		""
-#define CORR_C_HELP_7		""
-#define CORR_C_HELP_8		""
-#define CORR_C_HELP_9		""
-+#define CORR_C_HELP_6		"%s"
-+#define CORR_C_HELP_7		"%s"
-+#define CORR_C_HELP_8		"%s"
-+#define CORR_C_HELP_9		"%s"
- #define CORR_C_HELP_COMMANDS	"%s\nCommands are:%s\n%s\n"
- #define CORR_C_HELP_R_CMD	"R       Replace the misspelled word completely.%s\n"
- #define CORR_C_HELP_BLANK	"Space   Accept the word this time only.%s\n"
-diff --git a/tree.c b/tree.c
-index 05a6918..229ae16 100644
--- a/tree.c
-+++ b/tree.c
-@@ -351,7 +351,7 @@ void treeinsert (word, wordlen, keep)
-     struct dent *	oldhtab;
-     unsigned int	oldhsize;
-     ichar_t		nword[INPUTWORDLEN + MAXAFFIXLEN];
-    int			isvariant;
-+    MASKTYPE		isvariant;
- 
-     /*
-      * Expand hash table when it is MAXPCT % full.
-- 
--- a/pkgs/tools/text/ispell/patches/0023-Exclusive-options.patch
+++ b/pkgs/tools/text/ispell/patches/0023-Exclusive-options.patch
@ -1,38 +0,0 @@
-From: Robert Luberda <robert@debian.org>
-Date: Tue, 8 Mar 2011 21:12:23 +0100
-Subject: 0023 Exclusive options
-
-Make options -x and -b mutually exclusive
---
- ispell.c |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/ispell.c b/ispell.c
-index d130a0e..cd5802a 100644
--- a/ispell.c
-+++ b/ispell.c
-@@ -279,6 +279,7 @@ int main (argc, argv)
-     static char	outbuf[BUFSIZ];
-     int		argno;
-     int		arglen;
-+    int		bflag = 0;
- 
-     Cmd = *argv;
- 
-@@ -728,12 +729,13 @@ int main (argc, argv)
- 		nodictflag++;
- 		break;
- 	    case 'b':
-		if (arglen > 2)
-+		if (arglen > 2 || xflag == 1)
- 		    usage ();
- 		xflag = 0;		/* Keep a backup file */
-+		bflag = 1;
- 		break;
- 	    case 'x':
-		if (arglen > 2)
-+		if (arglen > 2 || bflag == 1)
- 		    usage ();
- 		xflag = 1;		/* Don't keep a backup file */
- 		break;
-- 
--- a/pkgs/tools/text/ispell/patches/0024-Check-tempdir-creation.patch
+++ b/pkgs/tools/text/ispell/patches/0024-Check-tempdir-creation.patch
@ -1,69 +0,0 @@
-From: Robert Luberda <robert@debian.org>
-Date: Tue, 8 Mar 2011 21:00:31 +0100
-Subject: 0024 Check tempdir creation
-
-Fail if temporary directory cannot be created.
---
- findaffix.X |    3 ++-
- munchlist.X |    3 ++-
- subset.X    |    3 ++-
- zapdups.X   |    3 ++-
- 4 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/findaffix.X b/findaffix.X
-index 2c253e2..58cabab 100755
--- a/findaffix.X
-+++ b/findaffix.X
-@@ -179,7 +179,8 @@ TEMPDIR=`mktemp -d ${TDIR}/faffXXXXXXXXXX 2>/dev/null`  ||  TEMPDIR="$TDIR"
- TMP=${TEMPDIR}/faff$$
- if [ "$TEMPDIR" = "$TDIR" ]
- then
-    TOREMOVE="${TMP}*"
-+    echo "Failed to create temporary directory; exiting"
-+    exit 1
- else
-     TOREMOVE="$TEMPDIR"
- fi
-diff --git a/munchlist.X b/munchlist.X
-index ada3f1d..47bb908 100755
--- a/munchlist.X
-+++ b/munchlist.X
-@@ -180,7 +180,8 @@ MUNCHDIR=`mktemp -d ${TDIR}/munchXXXXXXXXXX 2>/dev/null`  ||  MUNCHDIR="$TDIR"
- TMP=${MUNCHDIR}/munch$$
- if [ "$MUNCHDIR" = "$TDIR" ]
- then
-    TOREMOVE="${TMP}*"
-+    echo "$0: Failed to create temporary directory, exiting..."
-+	exit 1
- else
-     TOREMOVE="$MUNCHDIR"
- fi
-diff --git a/subset.X b/subset.X
-index cc748ec..9c904cc 100755
--- a/subset.X
-+++ b/subset.X
-@@ -125,7 +125,8 @@ TEMPDIR=`mktemp -d ${TDIR}/ssetXXXXXXXXXX 2>/dev/null`  ||  TEMPDIR="$TDIR"
- TMP=${TEMPDIR}/sset$$
- if [ "$TEMPDIR" = "$TDIR" ]
- then
-    TOREMOVE="${TMP}*"
-+    echo "$0: Failed to create temporary directory, exiting..."
-+    exit 1
- else
-     TOREMOVE="$TEMPDIR"
- fi
-diff --git a/zapdups.X b/zapdups.X
-index a68852a..1c610d4 100755
--- a/zapdups.X
-+++ b/zapdups.X
-@@ -111,7 +111,8 @@ TEMPDIR=`mktemp -d ${TDIR}/zapdXXXXXXXXXX 2>/dev/null`  ||  TEMPDIR="$TDIR"
- TMP=${TEMPDIR}/zapd$$
- if [ "$TEMPDIR" = "$TDIR" ]
- then
-    TOREMOVE="${TMP}*"
-+    echo "$0: Failed to create temporary directory, exiting..."
-+    exit 1
- else
-     TOREMOVE="$TEMPDIR"
- fi
-- 
--- a/pkgs/tools/text/ispell/patches/0025-Languages.patch
+++ b/pkgs/tools/text/ispell/patches/0025-Languages.patch
@ -1,81 +0,0 @@
-From: Robert Luberda <robert@debian.org>
-Date: Tue, 8 Mar 2011 21:02:47 +0100
-Subject: 0025 Languages
-
-Fix a few words.
---
- languages/english/british.0 |    1 +
- languages/english/english.0 |    8 ++++++--
- languages/english/english.1 |    3 ++-
- 3 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/languages/english/british.0 b/languages/english/british.0
-index dc4caa7..04d9177 100644
--- a/languages/english/british.0
-+++ b/languages/english/british.0
-@@ -46,6 +46,7 @@ armour/DGMRSZ
- armoured/U
- armourer/MS
- armoury/DMS
-+artefact/MS
- atomisation/MS
- atomise/DGRSZ
- authorisation/AMS
-diff --git a/languages/english/english.0 b/languages/english/english.0
-index fc13212..f85e15a 100644
--- a/languages/english/english.0
-+++ b/languages/english/english.0
-@@ -3502,6 +3502,7 @@ closure/DGMS
- cloth/DGS
- clothe/DGS
- clothed/U
-+cloths
- cloud/DGS
- clouded/U
- cloudless/PY
-@@ -10019,9 +10020,10 @@ mystery/MS
- mystic/MS
- mystical/Y
- mysticism/S
-myth/MS
-+myth/M
- mythical/Y
- mythology/MS
-+myths
- nag/MS
- nail/DGRS
- naive/PRY
-@@ -14818,6 +14820,7 @@ tent/DGRS
- tentacle/DS
- tentative/PY
- tented/U
-+tenth
- tenths
- tenure/DS
- tenured/U
-@@ -16511,8 +16514,9 @@ youngster/MS
- your/MS
- yourself
- yourselves
-youth/MS
-+youth/M
- youthful/PY
-+youths
- yuck
- Yugoslavian/MS
- yummy/R
-diff --git a/languages/english/english.1 b/languages/english/english.1
-index 2bfac86..78a7edf 100644
--- a/languages/english/english.1
-+++ b/languages/english/english.1
-@@ -7449,7 +7449,8 @@ metalloid
- metallurgic
- metallurgical/Y
- metallurgists
-metalsmith/S
-+metalsmith
-+metalsmiths
- metalwork/GJR
- metamorphic
- metamorphism
-- 
--- a/pkgs/tools/text/ispell/patches/0030-Display-whole-multibyte-character.patch
+++ b/pkgs/tools/text/ispell/patches/0030-Display-whole-multibyte-character.patch
@ -1,35 +0,0 @@
-From: Robert Luberda <robert@debian.org>
-Date: Mon, 21 Mar 2011 10:36:15 +0100
-Subject: 0030 Display whole multibyte character
-
-Display all bytes from multibyte characters instead of converting them
-into `cat -v' format. This fixes an ugly screen content shown while
-checking UTF-8 files.
---
- correct.c |   11 +++++++----
- 1 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/correct.c b/correct.c
-index 982b7c6..c91b41b 100644
--- a/correct.c
-+++ b/correct.c
-@@ -733,11 +733,14 @@ static int show_char (cp, linew, output, maxw)
- 	ichar = SET_SIZE + laststringch;
-     else
- 	ichar = chartoichar (ch);
-    if (!vflag  &&  iswordch (ichar)  &&  len == 1)
-+    if (!vflag  &&  iswordch (ichar)  &&  len >= 1)
- 	{
-	if (output)
-	    (void) putchar (ch);
-	(*cp)++;
-+	for (i = 0; i < len; ++i)
-+	    {
-+		if (output)
-+			(void) putchar (**cp);
-+		(*cp)++;
-+	    }
- 	return 1;
- 	}
-     if (ch == '\t')
-- 
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -207,6 +207,7 @@ mapAliases ({
  emacsPackages = emacs.pkgs; # added 2020-12-18
  emby = throw "The Emby derivation has been removed, see jellyfin instead for a free software fork."; # added 2019-05-01
  enblendenfuse = enblend-enfuse; # 2015-09-30
+  envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05
  esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # added 2021-04-12
  evolution_data_server = evolution-data-server; # added 2018-02-25
  etcdctl = etcd; # added 2018-04-25
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -1511,6 +1511,8 @@ in

  ecdsautils = callPackage ../tools/security/ecdsautils { };

+  echidna = haskell.lib.justStaticExecutables (haskellPackages.callPackage (../tools/security/echidna) { });
+
  sedutil = callPackage ../tools/security/sedutil { };

  elvish = callPackage ../shells/elvish { };
@ -2557,6 +2559,8 @@ in

  dgen-sdl = callPackage ../misc/emulators/dgen-sdl { };

+  dnschef = python3Packages.callPackage ../tools/networking/dnschef { };
+
  doitlive = callPackage ../tools/misc/doitlive { };

  dokuwiki = callPackage ../servers/web-apps/dokuwiki { };
@ -2636,6 +2640,9 @@ in
  element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix {
    inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
  };
+  element-desktop-wayland = element-desktop.override {
+    useWayland = true;
+  };

  element-web = callPackage ../applications/networking/instant-messengers/element/element-web.nix {
    conf = config.element-web.conf or {};
@ -2989,6 +2996,8 @@ in

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

+  lepton-eda = callPackage ../applications/science/electronics/lepton-eda { };
+
  lexicon = callPackage ../tools/admin/lexicon { };

  lief = callPackage ../development/libraries/lief {
@ -9051,6 +9060,8 @@ in
    autoreconfHook = buildPackages.autoreconfHook269;
  };

+  solc-select = with python3Packages; toPythonApplication solc-select;
+
  sourceHighlight = callPackage ../tools/text/source-highlight { };

  spacebar = callPackage ../os-specific/darwin/spacebar {
@ -10906,6 +10917,8 @@ in
    recurseIntoAttrs (callPackage ../development/compilers/flutter { });
  flutter = flutterPackages.stable;

+  fnlfmt = callPackage ../development/tools/fnlfmt { };
+
  fpc = callPackage ../development/compilers/fpc { };

  g203-led = callPackage ../tools/misc/g203-led { };
@ -14467,6 +14480,8 @@ in
    stdenv = gccStdenv;
  };

+  szyszka = callPackage ../tools/misc/szyszka { };
+
  taplo-cli = callPackage ../development/tools/taplo-cli {
    inherit (darwin.apple_sdk.frameworks) Security;
  };
@ -15677,6 +15692,7 @@ in

  goocanvas = callPackage ../development/libraries/goocanvas { };
  goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { };
+  goocanvas3 = callPackage ../development/libraries/goocanvas/3.x.nix { };
  goocanvasmm2 = callPackage ../development/libraries/goocanvasmm { };

  gflags = callPackage ../development/libraries/gflags { };
@ -15841,6 +15857,8 @@ in
    gdktarget = "x11";
  };

+  gtkextra = callPackage ../development/libraries/gtkextra { };
+
  gtk3 = callPackage ../development/libraries/gtk/3.x.nix {
    inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
  };
@ -23972,8 +23990,6 @@ in

  enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { };

-  envelope = callPackage ../applications/office/envelope { };
-
  eolie = callPackage ../applications/networking/browsers/eolie { };

  epdfview = callPackage ../applications/misc/epdfview { };
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -1874,6 +1874,8 @@ in {

  decopatch = callPackage ../development/python-modules/decopatch { };

+  deemix = callPackage ../development/python-modules/deemix { };
+
  deep_merge = callPackage ../development/python-modules/deep_merge { };

  deepdiff = callPackage ../development/python-modules/deepdiff { };
@ -1882,6 +1884,8 @@ in {

  deeptoolsintervals = callPackage ../development/python-modules/deeptoolsintervals { };

+  deezer-py = callPackage ../development/python-modules/deezer-py { };
+
  deezer-python = callPackage ../development/python-modules/deezer-python { };

  defcon = callPackage ../development/python-modules/defcon { };
@ -8172,6 +8176,8 @@ in {

  solax = callPackage ../development/python-modules/solax { };

+  solc-select = callPackage ../development/python-modules/solc-select { };
+
  solo-python = disabledIf (!pythonAtLeast "3.6") (callPackage ../development/python-modules/solo-python { });

  somajo = callPackage ../development/python-modules/somajo { };