Merge staging-next into staging

2024-11-23 07:23:20 +00:00 · 2021-07-08 12:02:00 +00:00 · 2021-07-08 12:02:00 +00:00 · 45ea39aeca
commit 45ea39aeca
parent f56f2a7cbd 958dc88d65
121 changed files with 2262 additions and 1257 deletions
--- a/.github/STALE-BOT.md
+++ b/.github/STALE-BOT.md
@ -3,7 +3,7 @@
 - Thanks for your contribution!
 - To remove the stale label, just leave a new comment.
 - _How to find the right people to ping?_ &rarr; [`git blame`](https://git-scm.com/docs/git-blame) to the rescue! (or GitHub's history and blame buttons.)
- You can always ask for help on [our Discourse Forum](https://discourse.nixos.org/) or on the [#nixos IRC channel](https://webchat.freenode.net/#nixos).
+- You can always ask for help on [our Discourse Forum](https://discourse.nixos.org/), [our Matrix room](https://matrix.to/#/#nix:nixos.org), or on the [#nixos IRC channel](https://web.libera.chat/#nixos).

 ## Suggestions for PRs

--- a/doc/builders/packages/weechat.section.md
+++ b/doc/builders/packages/weechat.section.md
@ -41,7 +41,7 @@ weechat.override {
  configure = { availablePlugins, ... }: {
    init = ''
      /set foo bar
-      /server add freenode chat.freenode.org
+      /server add libera irc.libera.chat
    '';
  };
 }
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -680,6 +680,12 @@
    githubId = 11699655;
    name = "Stanislas Lange";
  };
+  angustrau = {
+    name = "Angus Trau";
+    email = "nix@angus.ws";
+    github = "angustrau";
+    githubId = 13267947;
+  };
  anhdle14 = {
    name = "Le Anh Duc";
    email = "anhdle14@icloud.com";
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@ -348,6 +348,13 @@
          release instead of the old 2.7.7 version.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          The <literal>pulseeffects</literal> package updated to
+          <link xlink:href="https://github.com/wwmm/easyeffects/releases/tag/v6.0.0">version
+          4.x</link> and renamed to <literal>easyeffects</literal>.
+        </para>
+      </listitem>
      <listitem>
        <para>
          The <literal>libwnck</literal> package now defaults to the 3.x
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@ -108,7 +108,23 @@
    </arg>
     </group> <replaceable>name</replaceable>
   </arg>
+
   <sbr />
+
+   <arg>
+    <option>--build-host</option> <replaceable>host</replaceable>
+   </arg>
+
+   <arg>
+    <option>--target-host</option> <replaceable>host</replaceable>
+   </arg>
+
+   <arg>
+    <option>--use-remote-sudo</option>
+   </arg>
+
+   <sbr />
+
   <arg>
    <option>--show-trace</option>
   </arg>
--- a/nixos/doc/manual/preface.xml
+++ b/nixos/doc/manual/preface.xml
@ -18,12 +18,13 @@
 <para>
  If you encounter problems, please report them on the
  <literal
-   xlink:href="https://discourse.nixos.org">Discourse</literal> or
-  on the <link
+   xlink:href="https://discourse.nixos.org">Discourse</literal>,
+  the <link
+   xlink:href="https://matrix.to/#nix:nixos.org">Matrix room</link>,
+  or on the <link
   xlink:href="irc://irc.libera.chat/#nixos">
-  <literal>#nixos</literal> channel on Libera.Chat</link>, or
-  consider
-  <link
+  <literal>#nixos</literal> channel on Libera.Chat</link>.
+  Alternatively, consider <link
   xlink:href="#chap-contributing">
   contributing to this manual</link>. Bugs should be
  reported in
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@ -86,6 +86,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 * The `antlr` package now defaults to the 4.x release instead of the
  old 2.7.7 version.

+* The `pulseeffects` package updated to [version 4.x](https://github.com/wwmm/easyeffects/releases/tag/v6.0.0) and renamed to `easyeffects`.
+
 * The `libwnck` package now defaults to the 3.x release instead of the
  old 2.31.0 version.

--- a/nixos/modules/services/backup/postgresql-backup.nix
+++ b/nixos/modules/services/backup/postgresql-backup.nix
@ -14,15 +14,21 @@ let

      requires = [ "postgresql.service" ];

+      path = [ pkgs.coreutils pkgs.gzip config.services.postgresql.package ];
+
      script = ''
+        set -e -o pipefail
+
        umask 0077 # ensure backup is only readable by postgres user

        if [ -e ${cfg.location}/${db}.sql.gz ]; then
-          ${pkgs.coreutils}/bin/mv ${cfg.location}/${db}.sql.gz ${cfg.location}/${db}.prev.sql.gz
+          mv ${cfg.location}/${db}.sql.gz ${cfg.location}/${db}.prev.sql.gz
        fi

        ${dumpCmd} | \
-          ${pkgs.gzip}/bin/gzip -c > ${cfg.location}/${db}.sql.gz
+          gzip -c > ${cfg.location}/${db}.in-progress.sql.gz
+
+        mv ${cfg.location}/${db}.in-progress.sql.gz ${cfg.location}/${db}.sql.gz
      '';

      serviceConfig = {
@ -113,12 +119,12 @@ in {
    })
    (mkIf (cfg.enable && cfg.backupAll) {
      systemd.services.postgresqlBackup =
-        postgresqlBackupService "all" "${config.services.postgresql.package}/bin/pg_dumpall";
+        postgresqlBackupService "all" "pg_dumpall";
    })
    (mkIf (cfg.enable && !cfg.backupAll) {
      systemd.services = listToAttrs (map (db:
        let
-          cmd = "${config.services.postgresql.package}/bin/pg_dump ${cfg.pgdumpOptions} ${db}";
+          cmd = "pg_dump ${cfg.pgdumpOptions} ${db}";
        in {
          name = "postgresqlBackup-${db}";
          value = postgresqlBackupService db cmd;
--- a/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json
+++ b/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json
@ -0,0 +1,197 @@
+{
+  "bluez5.features.device": [
+    {
+      "name": "Air 1 Plus",
+      "no-features": [
+        "hw-volume-mic"
+      ]
+    },
+    {
+      "name": "AirPods",
+      "no-features": [
+        "msbc-alt1",
+        "msbc-alt1-rtl"
+      ]
+    },
+    {
+      "name": "AirPods Pro",
+      "no-features": [
+        "msbc-alt1",
+        "msbc-alt1-rtl"
+      ]
+    },
+    {
+      "name": "AXLOIE Goin",
+      "no-features": [
+        "msbc-alt1",
+        "msbc-alt1-rtl"
+      ]
+    },
+    {
+      "name": "JBL Endurance RUN BT",
+      "no-features": [
+        "msbc-alt1",
+        "msbc-alt1-rtl",
+        "sbc-xq"
+      ]
+    },
+    {
+      "name": "JBL LIVE650BTNC"
+    },
+    {
+      "name": "Soundcore Life P2-L",
+      "no-features": [
+        "msbc-alt1",
+        "msbc-alt1-rtl"
+      ]
+    },
+    {
+      "name": "Urbanista Stockholm Plus",
+      "no-features": [
+        "msbc-alt1",
+        "msbc-alt1-rtl"
+      ]
+    },
+    {
+      "address": "~^94:16:25:",
+      "no-features": [
+        "hw-volume"
+      ]
+    },
+    {
+      "address": "~^9c:64:8b:",
+      "no-features": [
+        "hw-volume"
+      ]
+    },
+    {
+      "address": "~^a0:e9:db:",
+      "no-features": [
+        "hw-volume"
+      ]
+    },
+    {
+      "address": "~^0c:a6:94:",
+      "no-features": [
+        "hw-volume"
+      ]
+    },
+    {
+      "address": "~^00:14:02:",
+      "no-features": [
+        "hw-volume"
+      ]
+    },
+    {
+      "address": "~^44:5e:f3:",
+      "no-features": [
+        "hw-volume"
+      ]
+    },
+    {
+      "address": "~^d4:9c:28:",
+      "no-features": [
+        "hw-volume"
+      ]
+    },
+    {
+      "address": "~^00:18:6b:",
+      "no-features": [
+        "hw-volume"
+      ]
+    },
+    {
+      "address": "~^b8:ad:3e:",
+      "no-features": [
+        "hw-volume"
+      ]
+    },
+    {
+      "address": "~^a0:e9:db:",
+      "no-features": [
+        "hw-volume"
+      ]
+    },
+    {
+      "address": "~^00:24:1c:",
+      "no-features": [
+        "hw-volume"
+      ]
+    },
+    {
+      "address": "~^00:11:b1:",
+      "no-features": [
+        "hw-volume"
+      ]
+    },
+    {
+      "address": "~^a4:15:66:",
+      "no-features": [
+        "hw-volume"
+      ]
+    },
+    {
+      "address": "~^00:14:f1:",
+      "no-features": [
+        "hw-volume"
+      ]
+    },
+    {
+      "address": "~^00:26:7e:",
+      "no-features": [
+        "hw-volume"
+      ]
+    },
+    {
+      "address": "~^90:03:b7:",
+      "no-features": [
+        "hw-volume"
+      ]
+    }
+  ],
+  "bluez5.features.adapter": [
+    {
+      "bus-type": "usb",
+      "vendor-id": "usb:0bda"
+    },
+    {
+      "bus-type": "usb",
+      "no-features": [
+        "msbc-alt1-rtl"
+      ]
+    },
+    {
+      "no-features": [
+        "msbc-alt1-rtl"
+      ]
+    }
+  ],
+  "bluez5.features.kernel": [
+    {
+      "sysname": "Linux",
+      "release": "~^[0-4]\\.",
+      "no-features": [
+        "msbc-alt1",
+        "msbc-alt1-rtl"
+      ]
+    },
+    {
+      "sysname": "Linux",
+      "release": "~^5\\.[1-7]\\.",
+      "no-features": [
+        "msbc-alt1",
+        "msbc-alt1-rtl"
+      ]
+    },
+    {
+      "sysname": "Linux",
+      "release": "~^5\\.(8|9|10)\\.",
+      "no-features": [
+        "msbc-alt1"
+      ]
+    },
+    {
+      "no-features": []
+    }
+  ]
+}
--- a/nixos/modules/services/desktops/pipewire/jack.conf.json
+++ b/nixos/modules/services/desktops/pipewire/jack.conf.json
@ -7,7 +7,7 @@
  },
  "context.modules": [
    {
-      "name": "libpipewire-module-rtkit",
+      "name": "libpipewire-module-rt",
      "args": {},
      "flags": [
        "ifexists",
--- a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
+++ b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
@ -15,6 +15,7 @@ let
  defaults = {
    alsa-monitor = (builtins.fromJSON (builtins.readFile ./alsa-monitor.conf.json));
    bluez-monitor = (builtins.fromJSON (builtins.readFile ./bluez-monitor.conf.json));
+    bluez-hardware = (builtins.fromJSON (builtins.readFile ./bluez-hardware.conf.json));
    media-session = (builtins.fromJSON (builtins.readFile ./media-session.conf.json));
    v4l2-monitor = (builtins.fromJSON (builtins.readFile ./v4l2-monitor.conf.json));
  };
@ -22,6 +23,7 @@ let
  configs = {
    alsa-monitor = recursiveUpdate defaults.alsa-monitor cfg.config.alsa-monitor;
    bluez-monitor = recursiveUpdate defaults.bluez-monitor cfg.config.bluez-monitor;
+    bluez-hardware = defaults.bluez-hardware;
    media-session = recursiveUpdate defaults.media-session cfg.config.media-session;
    v4l2-monitor = recursiveUpdate defaults.v4l2-monitor cfg.config.v4l2-monitor;
  };
@ -120,6 +122,10 @@ in {
      mkIf config.services.pipewire.pulse.enable {
        source = json.generate "bluez-monitor.conf" configs.bluez-monitor;
      };
+    environment.etc."pipewire/media-session.d/bluez-hardware.conf" =
+      mkIf config.services.pipewire.pulse.enable {
+        source = json.generate "bluez-hardware.conf" configs.bluez-hardware;
+      };

    environment.etc."pipewire/media-session.d/with-jack" =
      mkIf config.services.pipewire.jack.enable {
--- a/nixos/modules/services/networking/matterbridge.nix
+++ b/nixos/modules/services/networking/matterbridge.nix
@ -38,8 +38,8 @@ in
          # Use services.matterbridge.configPath instead.

          [irc]
-              [irc.freenode]
-              Server="irc.freenode.net:6667"
+              [irc.libera]
+              Server="irc.libera.chat:6667"
              Nick="matterbot"

          [mattermost]
@ -55,7 +55,7 @@ in
          name="gateway1"
          enable=true
              [[gateway.inout]]
-              account="irc.freenode"
+              account="irc.libera"
              channel="#testing"

              [[gateway.inout]]
--- a/nixos/modules/services/networking/znc/default.nix
+++ b/nixos/modules/services/networking/znc/default.nix
@ -133,8 +133,8 @@ in
              Nick = "paul";
              AltNick = "paul1";
              LoadModule = [ "chansaver" "controlpanel" ];
-              Network.freenode = {
-                Server = "chat.freenode.net +6697";
+              Network.libera = {
+                Server = "irc.libera.chat +6697";
                LoadModule = [ "simple_away" ];
                Chan = {
                  "#nixos" = { Detached = false; };
--- a/nixos/modules/services/networking/znc/options.nix
+++ b/nixos/modules/services/networking/znc/options.nix
@ -11,7 +11,7 @@ let

      server = mkOption {
        type = types.str;
-        example = "chat.freenode.net";
+        example = "irc.libera.chat";
        description = ''
          IRC server address.
        '';
@ -150,8 +150,8 @@ in
          '';
          example = literalExample ''
            {
-              "freenode" = {
-                server = "chat.freenode.net";
+              "libera" = {
+                server = "irc.libera.chat";
                port = 6697;
                useSSL = true;
                modules = [ "simple_away" ];
--- a/nixos/modules/virtualisation/oci-containers.nix
+++ b/nixos/modules/virtualisation/oci-containers.nix
@ -31,6 +31,30 @@ let
          example = literalExample "pkgs.dockerTools.buildDockerImage {...};";
        };

+        login = {
+
+          username = mkOption {
+            type = with types; nullOr str;
+            default = null;
+            description = "Username for login.";
+          };
+
+          passwordFile = mkOption {
+            type = with types; nullOr str;
+            default = null;
+            description = "Path to file containing password.";
+            example = "/etc/nixos/dockerhub-password.txt";
+          };
+
+          registry = mkOption {
+            type = with types; nullOr str;
+            default = null;
+            description = "Registry where to login to.";
+            example = "https://docker.pkg.github.com";
+          };
+
+        };
+
        cmd = mkOption {
          type =  with types; listOf str;
          default = [];
@ -220,6 +244,8 @@ let
      };
    };

+  isValidLogin = login: login.username != null && login.passwordFile != null && login.registry != null;
+
  mkService = name: container: let
    dependsOn = map (x: "${cfg.backend}-${x}.service") container.dependsOn;
  in {
@ -235,6 +261,13 @@ let

    preStart = ''
      ${cfg.backend} rm -f ${name} || true
+      ${optionalString (isValidLogin container.login) ''
+        cat ${container.login.passwordFile} | \
+          ${cfg.backend} login \
+            ${container.login.registry} \
+            --username ${container.login.username} \
+            --password-stdin
+        ''}
      ${optionalString (container.imageFile != null) ''
        ${cfg.backend} load -i ${container.imageFile}
        ''}
--- a/nixos/tests/postgresql.nix
+++ b/nixos/tests/postgresql.nix
@ -73,8 +73,30 @@ let
          machine.succeed(
              "systemctl start ${backupService}.service",
              "zcat /var/backup/postgresql/${backupName}.sql.gz | grep '<test>ok</test>'",
+              "ls -hal /var/backup/postgresql/ >/dev/console",
              "stat -c '%a' /var/backup/postgresql/${backupName}.sql.gz | grep 600",
          )
+      with subtest("Backup service fails gracefully"):
+          # Sabotage the backup process
+          machine.succeed("rm /run/postgresql/.s.PGSQL.5432")
+          machine.fail(
+              "systemctl start ${backupService}.service",
+          )
+          machine.succeed(
+              "ls -hal /var/backup/postgresql/ >/dev/console",
+              "zcat /var/backup/postgresql/${backupName}.prev.sql.gz | grep '<test>ok</test>'",
+              "stat /var/backup/postgresql/${backupName}.in-progress.sql.gz",
+          )
+          # In a previous version, the second run would overwrite prev.sql.gz,
+          # so we test a second run as well.
+          machine.fail(
+              "systemctl start ${backupService}.service",
+          )
+          machine.succeed(
+              "stat /var/backup/postgresql/${backupName}.in-progress.sql.gz",
+              "zcat /var/backup/postgresql/${backupName}.prev.sql.gz | grep '<test>ok</test>'",
+          )
+

      with subtest("Initdb works"):
          machine.succeed("sudo -u postgres initdb -D /tmp/testpostgres2")
--- a/pkgs/applications/audio/easyeffects/default.nix
+++ b/pkgs/applications/audio/easyeffects/default.nix
@ -0,0 +1,85 @@
+{ lib, stdenv
+, desktop-file-utils
+, fetchFromGitHub
+, fftwFloat
+, glib
+, glibmm
+, gtk4
+, gtkmm4
+, itstool
+, libbs2b
+, libebur128
+, libsamplerate
+, libsndfile
+, lilv
+, lv2
+, meson
+, ninja
+, nlohmann_json
+, pipewire
+, pkg-config
+, python3
+, rnnoise
+, rubberband
+, speexdsp
+, wrapGAppsHook
+, zita-convolver
+}:
+
+stdenv.mkDerivation rec {
+  pname = "easyeffects";
+  version = "6.0.0";
+
+  src = fetchFromGitHub {
+    owner = "wwmm";
+    repo = "easyeffects";
+    rev = "v${version}";
+    hash = "sha256:1m3jamnhgpx3z51nfc8xg7adhf5x7dirvw0wf129hzxx4fjl7rch";
+  };
+
+  nativeBuildInputs = [
+    desktop-file-utils
+    itstool
+    meson
+    ninja
+    pkg-config
+    python3
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    fftwFloat
+    glib
+    glibmm
+    gtk4
+    gtkmm4
+    libbs2b
+    libebur128
+    libsamplerate
+    libsndfile
+    lilv
+    lv2
+    nlohmann_json
+    pipewire
+    rnnoise
+    rubberband
+    speexdsp
+    zita-convolver
+  ];
+
+  postPatch = ''
+    chmod +x meson_post_install.py
+    patchShebangs meson_post_install.py
+  '';
+
+  separateDebugInfo = true;
+
+  meta = with lib; {
+    description = "Audio effects for PipeWire applications.";
+    homepage = "https://github.com/wwmm/easyeffects";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.linux;
+    badPlatforms = [ "aarch64-linux" ];
+  };
+}
--- a/pkgs/applications/audio/pulseeffects/default.nix
+++ b/pkgs/applications/audio/pulseeffects/default.nix
@ -1,127 +0,0 @@
-{ lib, stdenv
-, fetchFromGitHub
-, fetchpatch
-, meson
-, ninja
-, pkg-config
-, itstool
-, python3
-, libxml2
-, desktop-file-utils
-, wrapGAppsHook
-, gst_all_1
-, pipewire
-, gtk3
-, glib
-, glibmm
-, gtkmm3
-, lilv
-, lv2
-, serd
-, sord
-, sratom
-, libbs2b
-, libsamplerate
-, libsndfile
-, libebur128
-, rnnoise
-, boost
-, dbus
-, fftwFloat
-, calf
-, zita-convolver
-, zam-plugins
-, rubberband
-, lsp-plugins
-}:
-
-let
-  lv2Plugins = [
-    calf # limiter, compressor exciter, bass enhancer and others
-    lsp-plugins # delay
-  ];
-  ladspaPlugins = [
-    rubberband # pitch shifting
-    zam-plugins # maximizer
-  ];
-in stdenv.mkDerivation rec {
-  pname = "pulseeffects";
-  version = "5.0.3";
-
-  src = fetchFromGitHub {
-    owner = "wwmm";
-    repo = "pulseeffects";
-    rev = "v${version}";
-    sha256 = "1dicvq17vajk3vr4g1y80599ahkw0dp5ynlany1cfljfjz40s8sx";
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    libxml2
-    itstool
-    python3
-    desktop-file-utils
-    wrapGAppsHook
-  ];
-
-  buildInputs = [
-    pipewire
-    glib
-    glibmm
-    gtk3
-    gtkmm3
-    gst_all_1.gstreamer
-    gst_all_1.gst-plugins-base # gst-fft
-    gst_all_1.gst-plugins-good # spectrum plugin
-    gst_all_1.gst-plugins-bad
-    lilv lv2 serd sord sratom
-    libbs2b
-    libebur128
-    libsamplerate
-    libsndfile
-    rnnoise
-    boost
-    dbus
-    fftwFloat
-    zita-convolver
-  ];
-
-  patches = [
-    (fetchpatch {
-      # Fix build failure.
-      # https://github.com/wwmm/pulseeffects/pull/934
-      url = "https://github.com/wwmm/pulseeffects/commit/ab7354a6850d23840b4c9af212dbebf4f31a562f.patch";
-      sha256 = "1hd05xn6sp0xs632mqgwk19hl40kh2f69mx5mgzahysrj057w22c";
-    })
-  ];
-
-  postPatch = ''
-    chmod +x meson_post_install.py
-    patchShebangs meson_post_install.py
-  '';
-
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --set LV2_PATH "${lib.makeSearchPath "lib/lv2" lv2Plugins}"
-      --set LADSPA_PATH "${lib.makeSearchPath "lib/ladspa" ladspaPlugins}"
-    )
-  '';
-
-  # Meson is no longer able to pick up Boost automatically.
-  # https://github.com/NixOS/nixpkgs/issues/86131
-  BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
-  BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
-
-  separateDebugInfo = true;
-
-  meta = with lib; {
-    description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications";
-    homepage = "https://github.com/wwmm/pulseeffects";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ jtojnar ];
-    platforms = platforms.linux;
-    badPlatforms = [ "aarch64-linux" ];
-  };
-}
--- a/pkgs/applications/blockchains/btcpayserver/default.nix
+++ b/pkgs/applications/blockchains/btcpayserver/default.nix
@ -15,13 +15,13 @@ in

 stdenv.mkDerivation rec {
  pname = "btcpayserver";
-  version = "1.1.1";
+  version = "1.1.2";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-cCm4CZdVtjO2nj69CgRCrcwO0lAbiQVD6KocOj4CSdY=";
+    sha256 = "sha256-A9XIKCw1dL4vUQYSu6WdmpR82dAbtKVTyjllquyRGgs=";
  };

  nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ];
--- a/pkgs/applications/blockchains/electrs.nix
+++ b/pkgs/applications/blockchains/electrs.nix
@ -6,20 +6,20 @@

 rustPlatform.buildRustPackage rec {
  pname = "electrs";
-  version = "0.8.9";
+  version = "0.8.10";

  src = fetchFromGitHub {
    owner = "romanz";
    repo = pname;
    rev = "v${version}";
-    sha256 = "01fli2k5yh4iwlds97p5c36q19s3zxrqhkzp9dsjbgsf7sv35r3y";
+    sha256 = "0q7mvpflnzzm88jbsdxgvhk9jr5mvn23hhj2iwy2grnfngxsmz3y";
  };

  # needed for librocksdb-sys
  nativeBuildInputs = [ llvmPackages.clang ];
  LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";

-  cargoSha256 = "1rqpadlr9r4z2z825li6vi5a21hivc3bsn5ibxshrdrwiycyyxz8";
+  cargoSha256 = "0i8npa840g4kz50n6x40z22x9apq8snw6xgjz4vn2kh67xc4c738";

  meta = with lib; {
    description = "An efficient re-implementation of Electrum Server in Rust";
--- a/pkgs/applications/blockchains/nbxplorer/default.nix
+++ b/pkgs/applications/blockchains/nbxplorer/default.nix
@ -15,13 +15,13 @@ in

 stdenv.mkDerivation rec {
  pname = "nbxplorer";
-  version = "2.1.51";
+  version = "2.1.52";

  src = fetchFromGitHub {
    owner = "dgarage";
    repo = "NBXplorer";
    rev = "v${version}";
-    sha256 = "sha256-tvuuoDZCSDFa8gAVyH+EP1DLtdPfbkr+w5lSxZkzZXg=";
+    sha256 = "sha256-+BP71TQ8BTGZ/SbS7CrI4D7hcQaVLt+hCpInbOdU5GY=";
  };

  nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ];
--- a/pkgs/applications/blockchains/nbxplorer/deps.nix
+++ b/pkgs/applications/blockchains/nbxplorer/deps.nix
@ -181,23 +181,23 @@
  })
  (fetchNuGet {
    name = "NBitcoin.Altcoins";
-    version = "2.0.31";
-    sha256 = "13gcfsxpfq8slmsvgzf6iv581x7n535zq0p9c88bqs5p88r6lygm";
+    version = "2.0.33";
+    sha256 = "12r4w89247xzrl2g01iv13kg1wl7gzfz1zikimx6dyhr4iipbmgf";
  })
  (fetchNuGet {
    name = "NBitcoin.TestFramework";
-    version = "2.0.22";
-    sha256 = "1zwhjy6xppl01jhkgl7lqjsmi8crny4qq22ml20cz8l437j1zi4n";
+    version = "2.0.23";
+    sha256 = "03jw3gay7brm7s7jwn4zbk1n1sq7gck523cx3ckx87v3wi2062lx";
  })
  (fetchNuGet {
    name = "NBitcoin";
-    version = "5.0.76";
-    sha256 = "0q3ilmsrw9ip1s38qmfs4qi02xvccmy1naafffn5yxj08q0n1p79";
+    version = "5.0.78";
+    sha256 = "1mfn045l489bm2xgjhvddhfy4xxcy42q6jhq4nyd6fnxg4scxyg9";
  })
  (fetchNuGet {
    name = "NBitcoin";
-    version = "5.0.77";
-    sha256 = "0ykz4ii6lh6gdlz6z264wnib5pfnmq9q617qqbg0f04mq654jygb";
+    version = "5.0.81";
+    sha256 = "1fba94kc8yzykb1m5lvpx1hm63mpycpww9cz5zfp85phs1spdn8x";
  })
  (fetchNuGet {
    name = "NETStandard.Library";
--- a/pkgs/applications/blockchains/polkadot/default.nix
+++ b/pkgs/applications/blockchains/polkadot/default.nix
@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "polkadot";
-  version = "0.9.7";
+  version = "0.9.8";

  src = fetchFromGitHub {
    owner = "paritytech";
    repo = "polkadot";
    rev = "v${version}";
-    sha256 = "sha256-swPLJIcm8XD0+/e9pGK2bDqUb7AS/5FdQ3A7Ceh5dZc=";
+    sha256 = "sha256-5PNogoahAZUjIlQsVXwm7j5OmP3/uEEdV0vrIDXXBx8=";
  };

-  cargoSha256 = "sha256-4njx8T3kzyN63Jo0aHee5ImqcObiADvi+dHKWcRmbQw=";
+  cargoSha256 = "0iikys90flzmnnb6l2wzag8mp91p6z9y7rjzym2sd6m7xhgbc1x6";

  nativeBuildInputs = [ clang ];

--- a/pkgs/applications/editors/texmacs/default.nix
+++ b/pkgs/applications/editors/texmacs/default.nix
@ -16,7 +16,7 @@

 let
  pname = "TeXmacs";
-  version = "1.99.19";
+  version = "2.1";
  common = callPackage ./common.nix {
    inherit tex extraFonts chineseFonts japaneseFonts koreanFonts;
  };
@ -26,7 +26,7 @@ mkDerivation {

  src = fetchurl {
    url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
-    sha256 = "1izwqb0z4gqiglv57mjswk6sjivny73kd2sxrf3nmj7wr12pn5m8";
+    sha256 = "1gl6k1bwrk1y7hjyl4xvlqvmk5crl4jvsk8wrfp7ynbdin6n2i48";
  };

  nativeBuildInputs = [ cmake pkg-config ];
--- a/pkgs/applications/misc/dnd-tools/default.nix
+++ b/pkgs/applications/misc/dnd-tools/default.nix
@ -0,0 +1,28 @@
+{ python3, fetchFromGitHub, fetchpatch, lib }:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "dnd-tools";
+  version = "unstable-2021-02-18";
+
+  src = fetchFromGitHub {
+    owner = "savagezen";
+    repo = pname;
+    rev = "baefb9e4b4b8279be89ec63d256dde9704dee078";
+    sha256 = "1rils3gzbfmwvgy51ah77qihwwbvx50q82lkc1kwcb55b3yinnmj";
+  };
+
+  # gives warning every time unless patched, see https://github.com/savagezen/dnd-tools/pull/20
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/savagezen/dnd-tools/commit/0443f3a232056ad67cfb09eb3eadcb6344659198.patch";
+      sha256 = "00k8rsz2aj4sfag6l313kxbphcb5bjxb6z3aw66h26cpgm4kysp0";
+    })
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/savagezen/dnd-tools";
+    description = "A set of interactive command line tools for Dungeons and Dragons 5th Edition";
+    license = licenses.agpl3Only;
+    maintainers = [ maintainers.urlordjames ];
+  };
+}
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@ -13,12 +13,12 @@

 stdenv.mkDerivation rec {
  pname = "IPMIView";
-  version = "2.18.0";
-  buildVersion = "201007";
+  version = "2.19.0";
+  buildVersion = "210401";

  src = fetchurl {
    url = "https://www.supermicro.com/wftp/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz";
-    sha256 = "10cv63yhh81gjxahsg4y3zp4mjivc217m4z1vcpwvvnds46c65h8";
+    sha256 = "sha256-6hxOu/Wkcrp9MaMYlxOR2DZW21Wi3BIFZp3Vm8NRBWs=";
  };

  nativeBuildInputs = [ patchelf makeWrapper ];
@ -29,10 +29,14 @@ stdenv.mkDerivation rec {
      else throw "IPMIView is not supported on this platform";
    in
  ''
-    patchelf --set-rpath "${lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so
-    patchelf --set-rpath "${lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so
-    patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java
+    runHook preBuild
+
+    patchelf --set-rpath "${lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/libawt_xawt.so
+    patchelf --set-rpath "${lib.makeLibraryPath [ freetype ]}" ./jre/lib/libfontmanager.so
+    patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java
    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./BMCSecurity/${stunnelBinary}
+
+    runHook postBuild
  '';

  desktopItem = makeDesktopItem rec {
@ -44,6 +48,8 @@ stdenv.mkDerivation rec {
  };

  installPhase = ''
+    runHook preInstall
+
    mkdir -p $out/bin
    cp -R . $out/

@ -61,6 +67,8 @@ stdenv.mkDerivation rec {
             mkdir -p $WORK_DIR
             ln -snf '$out'/iKVM.jar '$out'/iKVM_ssl.jar '$out'/libiKVM* '$out'/libSharedLibrary* $WORK_DIR
             cd $WORK_DIR'
+
+    runHook postInstall
  '';

  meta = with lib; {
--- a/pkgs/applications/misc/pinfo/default.nix
+++ b/pkgs/applications/misc/pinfo/default.nix
@ -1,24 +1,45 @@
-{ lib, stdenv, fetchurl, autoreconfHook, gettext, texinfo, ncurses, readline }:
+{ lib
+, autoreconfHook
+, fetchFromGitHub
+, gettext
+, ncurses
+, readline
+, stdenv
+, texinfo
+}:

-stdenv.mkDerivation {
-  name = "pinfo-0.6.10";
+stdenv.mkDerivation rec {
+  pname = "pinfo";
+  version = "0.6.13";

-  src = fetchurl {
-    # homepage needed you to login to download the tarball
-    url = "https://src.fedoraproject.org/repo/pkgs/pinfo/pinfo-0.6.10.tar.bz2"
-      + "/fe3d3da50371b1773dfe29bf870dbc5b/pinfo-0.6.10.tar.bz2";
-    sha256 = "0p8wyrpz9npjcbx6c973jspm4c3xz4zxx939nngbq49xqah8088j";
+  src = fetchFromGitHub {
+    owner = "baszoetekouw";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "173d2p22irwiabvr4z6qvr6zpr6ysfkhmadjlyhyiwd7z62larvy";
  };

-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ gettext texinfo ncurses readline ];
+  nativeBuildInputs = [
+    autoreconfHook
+  ];

-  configureFlags = [ "--with-curses=${ncurses.dev}" "--with-readline=${readline.dev}" ];
+  buildInputs = [
+    gettext
+    texinfo
+    ncurses
+    readline
+  ];
+
+  configureFlags = [
+    "--with-curses=${ncurses.dev}"
+    "--with-readline=${readline.dev}"
+  ];

  meta = with lib; {
    description = "A viewer for info files";
+    homepage = "https://github.com/baszoetekouw/pinfo";
    license = licenses.gpl2Plus;
    platforms = platforms.unix;
+    maintainers = with maintainers; [ fab ];
  };
 }
-
--- a/pkgs/applications/networking/cluster/helmsman/default.nix
+++ b/pkgs/applications/networking/cluster/helmsman/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "helmsman";
-  version = "3.6.11";
+  version = "3.7.0";

  src = fetchFromGitHub {
    owner = "Praqma";
    repo = "helmsman";
    rev = "v${version}";
-    sha256 = "sha256-9G/A6eADt9jP0CZC6MTZnQOmGOItJFI0zTfmC7HXSaI=";
+    sha256 = "sha256-Xp86tCIM7XVtue/MjQ8/wGs2fHfxSWS3B6MzNMYRqg4=";
  };

  vendorSha256 = "sha256-icX8mOc8g+DhfAjD1pzneLWTXY17lXyAjdPOWAxkHwI=";
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -533,10 +533,10 @@
    "owner": "mrparkers",
    "provider-source-address": "registry.terraform.io/mrparkers/keycloak",
    "repo": "terraform-provider-keycloak",
-    "rev": "v3.0.0",
-    "sha256": "1q9vzmj9c7mznv6al58d3rs5kk1fh28k1qccx46hcbk82z52da3a",
-    "vendorSha256": "0kh6lljvqd577s19gx0fmfsmx9wm3ikla3jz16lbwwb8ahbqcw1f",
-    "version": "3.0.0"
+    "rev": "v3.1.1",
+    "sha256": "0qh0y1j3y5hzcr8h8wzralv7h8dmrg8jnjccz0fzcmhbkazfrs4p",
+    "vendorSha256": "0il4rvwa23zghrq0b8qrzgxyjy0211v9z2a4ln2xmlhcz0105zg8",
+    "version": "3.1.1"
  },
  "ksyun": {
    "owner": "terraform-providers",
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@ -194,9 +194,9 @@ rec {
  };

  terraform_1_0 = mkTerraform {
-    version = "1.0.1";
-    sha256 = "0sy33wf2wjhybr5smmyla7ci61w8irk0nrv3vv7h87yli1dd9yj0";
-    vendorSha256 = "0ai7h85f0xdlh7q04l4hb9m5wajyqbylhvpjanlhkzvc60silhmx";
+    version = "1.0.2";
+    sha256 = "0gnv6hajpn1ks4944cr8rgkvly9cgvx4zj1zwc7nf1sikqfa8r1a";
+    vendorSha256 = "0q1frza5625b1va0ipak7ns3myca9mb02r60h0py3v5gyl2cb4dk";
    patches = [ ./provider-path-0_15.patch ];
    passthru = { inherit plugins; };
  };
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
@ -21,7 +21,7 @@ let
    python_magic
  ]);

-  version = "0.2.0";
+  version = "0.3.0";
 in buildPythonPackage {
  pname = "weechat-matrix";
  inherit version;
@ -30,7 +30,7 @@ in buildPythonPackage {
    owner = "poljar";
    repo = "weechat-matrix";
    rev = version;
-    hash = "sha256-qsTdF9mGHac4rPs53mgoOElcujicRNXbJ7GsoptWSGc=";
+    hash = "sha256-o4kgneszVLENG167nWnk2FxM+PsMzi+PSyMUMIktZcc=";
  };

  propagatedBuildInputs = [
--- a/pkgs/applications/networking/juju/default.nix
+++ b/pkgs/applications/networking/juju/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "juju";
-  version = "2.8.7";
+  version = "2.9.5";

  src = fetchFromGitHub {
    owner = "juju";
    repo = "juju";
    rev = "juju-${version}";
-    sha256 = "sha256-ZiG+LMeQboFxaLIBSHjRNe5tt8bEguYXQp3nhkoMpek=";
+    sha256 = "sha256-oBwusx63a8AWNHqlNtG0S/SiIRM55fbc/CGN2MFJDYA=";
  };

-  vendorSha256 = "sha256-5R3TmwOzHgdEQhS4B4Bb0InghaEhUVxDSl7oZl3aNZ4=";
+  vendorSha256 = "sha256-VHUDqDsfY0c6r5sJbMX7JcXTIBXze9cd5qHqZWZAC2g=";

  # Disable tests because it attempts to use a mongodb instance
  doCheck = false;
--- a/pkgs/applications/networking/maestral-qt/default.nix
+++ b/pkgs/applications/networking/maestral-qt/default.nix
@ -6,14 +6,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "maestral-qt";
-  version = "1.4.5";
+  version = "1.4.6";
  disabled = python3.pkgs.pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = "SamSchott";
    repo = "maestral-qt";
    rev = "v${version}";
-    sha256 = "sha256-HaEQTmpyM1r/+rTkki93aStdzdnhNmkfNJTZRTPehTw=";
+    sha256 = "sha256-Y4n67LJyNUsLmGMu7B73n888qmCQ9HjxCSM1MlfTbqQ=";
  };

  propagatedBuildInputs = with python3.pkgs; [
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@ -4,16 +4,16 @@ let
  common = { stname, target, postInstall ? "" }:
    buildGoModule rec {
      pname = stname;
-      version = "1.17.0";
+      version = "1.18.0";

      src = fetchFromGitHub {
        owner  = "syncthing";
        repo   = "syncthing";
        rev    = "v${version}";
-        sha256 = "1bm2xj5ypn63wxxpdix9b4hbam3s2z08jx2rk5adzd5yg499sxx0";
+        sha256 = "0hrdlc1dxbxvqxylk0i2f110c6bfp9azsnzqzmjj2b29xxbrmwca";
      };

-      vendorSha256 = "1jvd7d095wvf94y2di48pvqv9hiw3bj859q5yx9v6lglkwdgz6nw";
+      vendorSha256 = "1qqpxm4s1s2yp1zmi4m25y1a6r7kxc5rmvfsg50jmqsfnwligpz6";

      doCheck = false;

--- a/pkgs/applications/version-management/mercurial/4.9.nix
+++ b/pkgs/applications/version-management/mercurial/4.9.nix
@ -1,21 +1,19 @@
 { lib, stdenv, fetchurl, python2Packages, makeWrapper
 , guiSupport ? false, tk ? null
 , ApplicationServices
-, mercurialSrc ? fetchurl rec {
-    meta.name = "mercurial-${meta.version}";
-    meta.version = "4.9.1";
-    url = "https://mercurial-scm.org/release/${meta.name}.tar.gz";
-    sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v";
-  }
 }:

 let
  inherit (python2Packages) docutils hg-git dulwich python;

-in python2Packages.buildPythonApplication {
+in python2Packages.buildPythonApplication rec {
+  pname = "mercurial";
+  version = "4.9.1";

-  inherit (mercurialSrc.meta) name version;
-  src = mercurialSrc;
+  src = fetchurl {
+    url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
+    sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v";
+  };

  format = "other";

@ -59,7 +57,6 @@ in python2Packages.buildPythonApplication {
    '';

  meta = {
-    inherit (mercurialSrc.meta) version;
    description = "A fast, lightweight SCM system for very large distributed projects";
    homepage = "https://www.mercurial-scm.org";
    downloadPage = "https://www.mercurial-scm.org/release/";
@ -69,4 +66,3 @@ in python2Packages.buildPythonApplication {
    platforms = lib.platforms.unix;
  };
 }
-
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@ -1,20 +1,18 @@
 { lib, fetchurl, python3Packages
 , mercurial, qt5
 }:
-let
-  tortoisehgSrc = fetchurl rec {
-    meta.name = "tortoisehg-${meta.version}";
-    meta.version = "5.8";
-    url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${meta.version}.tar.gz";
-    sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3";
-  };

-  # Extension point for when thg's mercurial is lagging behind mainline.
-  tortoiseMercurial = mercurial;
+python3Packages.buildPythonApplication rec {
+    pname = "tortoisehg";
+    version = "5.8";

-in python3Packages.buildPythonApplication {
-    inherit (tortoisehgSrc.meta) name version;
-    src = tortoisehgSrc;
+    src = fetchurl {
+      url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz";
+      sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3";
+    };
+
+    # Extension point for when thg's mercurial is lagging behind mainline.
+    tortoiseMercurial = mercurial;

    propagatedBuildInputs = with python3Packages; [
      tortoiseMercurial qscintilla-qt5 iniparse
--- a/pkgs/applications/window-managers/dwm/default.nix
+++ b/pkgs/applications/window-managers/dwm/default.nix
@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
    in
    lib.optionalString (conf != null) "cp ${configFile} config.def.h";

+  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
+
  meta = with lib; {
    homepage = "https://dwm.suckless.org/";
    description = "An extremely fast, small, and dynamic window manager for X";
--- a/pkgs/applications/window-managers/i3/workstyle.nix
+++ b/pkgs/applications/window-managers/i3/workstyle.nix
@ -5,16 +5,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "workstyle";
-  version = "0.2.1";
+  version = "unstable-2021-05-09";

  src = fetchFromGitHub {
    owner = "pierrechevalier83";
    repo = pname;
-    rev = "43b0b5bc0a66d40289ff26b8317f50510df0c5f9";
-    sha256 = "0f4hwf236823qmqy31fczjb1hf3fvvac3x79jz2l7li55r6fd8hn";
+    rev = "f2023750d802259ab3ee7d7d1762631ec157a0b1";
+    sha256 = "04xds691sw4pi2nq8xvdhn0312wwia60gkd8b1bjqy11zrqbivbx";
  };

-  cargoSha256 = "1hy68wvsxncsy4yx4biigfvwyq18c7yp1g543c6nca15cdzs1c54";
+  cargoSha256 = "0xwv8spr96z4aimjlr15bhwl6i3zqp7jr45d9zr3sbi9d8dbdja2";

  doCheck = false; # No tests

--- a/pkgs/applications/window-managers/leftwm/default.nix
+++ b/pkgs/applications/window-managers/leftwm/default.nix
@ -6,16 +6,16 @@ in

 rustPlatform.buildRustPackage rec {
  pname = "leftwm";
-  version = "0.2.7";
+  version = "0.2.8";

  src = fetchFromGitHub {
    owner = "leftwm";
    repo = "leftwm";
    rev = version;
-    sha256 = "sha256-nRPt+Tyfq62o+3KjsXkHQHUMMslHFGNBd3s2pTb7l4w=";
+    sha256 = "sha256-T4A9NGT6sUSTKmLcAWjcp3Y8QQzZFAVSXevXtGm3szY=";
  };

-  cargoSha256 = "sha256-lmzA7XM8B5QJI4Wo0cKeMR3+np6jT6mdGzTry4g87ng=";
+  cargoSha256 = "sha256-2prRtdBxpYc2xI/bLZNlqs3mxESfO9GhNUSlKFF//eE=";

  nativeBuildInputs = [ makeWrapper ];
  buildInputs = [ libX11 libXinerama ];
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@ -132,6 +132,7 @@ rec {
    cp ${./tarsum.go} tarsum.go
    export GOPATH=$(pwd)
    export GOCACHE="$TMPDIR/go-cache"
+    export GO111MODULE=off
    mkdir -p src/github.com/docker/docker/pkg
    ln -sT ${docker.moby-src}/pkg/tarsum src/github.com/docker/docker/pkg/tarsum
    go build
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@ -1,6 +1,6 @@
 {
-  "commit": "1567e96c400fcd62dfc0d9412881591d6e1e9f22",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/1567e96c400fcd62dfc0d9412881591d6e1e9f22.tar.gz",
-  "sha256": "04z26ypfp3nip2x6gwrv5k1lmckmmi03ry3z97syc72qqj59n9hq",
-  "msg": "Update from Hackage at 2021-06-26T12:56:56Z"
+  "commit": "080786cc20b9223cc5c1dc04d3e47ce3ad0b0f36",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/080786cc20b9223cc5c1dc04d3e47ce3ad0b0f36.tar.gz",
+  "sha256": "0shv10s208nazb7q36vsx6a4sy7a14qikad4b984r9gz3j6g7l62",
+  "msg": "Update from Hackage at 2021-07-02T10:49:03Z"
 }
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@ -3,13 +3,13 @@

 stdenv.mkDerivation (rec {
  pname = "ponyc";
-  version = "0.41.1";
+  version = "0.42.0";

  src = fetchFromGitHub {
    owner = "ponylang";
    repo = pname;
    rev = version;
-    sha256 = "02wx070cy1193xzv58vh79yzwgpqiayqlwd3i285698fppbcg69a";
+    sha256 = "1s8glmzz0g5lj1fjwwy4m3n660smiq5wl9r1lg686wqh42hcgnsy";

 # Due to a bug in LLVM 9.x, ponyc has to include its own vendored patched
 # LLVM.  (The submodule is a specific tag in the LLVM source tree).
--- a/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch
+++ b/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch
@ -1,21 +1,21 @@
--- a/lib/CMakeLists.txt	2021-05-27 15:58:36.819331229 -0400
-+++ b/lib/CMakeLists.txt	2021-05-27 16:00:19.768268649 -0400
-@@ -10,12 +10,12 @@
+--- a/lib/CMakeLists.txt.orig	2021-07-07 13:40:20.209410160 -0400
+++ a/lib/CMakeLists.txt	2021-07-07 13:43:11.886969662 -0400
+@@ -15,12 +15,12 @@
 endif()
 
 ExternalProject_Add(gbenchmark
-    URL https://github.com/google/benchmark/archive/v1.5.2.tar.gz
-+    SOURCE_DIR gbenchmark-prefix/src/benchmark
+-    URL ${PONYC_GBENCHMARK_URL}
+	SOURCE_DIR gbenchmark-prefix/src/benchmark
     CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DCMAKE_CXX_FLAGS=-fpic --no-warn-unused-cli
 )
 
 ExternalProject_Add(googletest
 -    URL https://github.com/google/googletest/archive/release-1.8.1.tar.gz
-+    URL @googletest@
+	URL @googletest@
     CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_CXX_FLAGS=-fpic -Dgtest_force_shared_crt=ON --no-warn-unused-cli
 )
 
-@@ -28,75 +28,6 @@
+@@ -33,75 +33,6 @@
     COMPONENT library
 )
 
--- a/pkgs/development/compilers/purescript/purescript/default.nix
+++ b/pkgs/development/compilers/purescript/purescript/default.nix
@ -18,19 +18,19 @@ let

 in stdenv.mkDerivation rec {
  pname = "purescript";
-  version = "0.14.2";
+  version = "0.14.3";

  src =
    if stdenv.isDarwin
    then
    fetchurl {
      url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
-      sha256 = "1ga2hn9br71dyzn3p9jvjiksvnq21p6i5hp1z1j5fpz9la28nqzf";
+      sha256 = "1ipksp6kx3h030xf1y3y30gazrdz893pklanwak27hbqfy3ckssj";
    }
    else
    fetchurl {
      url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
-      sha256 = "1kv7dm1nw85lw3brrclkj7xc9p021jx3n8wgp2fg3572s86ypskw";
+      sha256 = "158jyjpfgd84gbwpxqj41mvpy0fmb1d1iqq2h42sc7041v2f38p0";
    };


--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -64,7 +64,7 @@ self: super: {
      name = "git-annex-${super.git-annex.version}-src";
      url = "git://git-annex.branchable.com/";
      rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "1hf2i36ayscdg7fa81akx031chg8c3scbjphj4c1qawif41bynmm";
+      sha256 = "0nvaaba06dgkl2kfq6ldmj0v6mm2dh7wfky6lsxxy5kskbncyqjr";
      # delete android and Android directories which cause issues on
      # darwin (case insensitive directory). Since we don't need them
      # during the build process, we can delete it to prevent a hash
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@ -74,6 +74,7 @@ broken-packages:
  - aeson-filthy
  - aeson-flowtyped
  - aeson-match-qq
+  - aeson-modern-tojson
  - aeson-options
  - aeson-prefix
  - aeson-schema
@ -261,6 +262,7 @@ broken-packages:
  - aws-route53
  - aws-sdk-text-converter
  - aws-simple
+  - aws-xray-client-persistent
  - axel
  - azubi
  - azure-acs
@ -1904,6 +1906,7 @@ broken-packages:
  - haskell-src-match
  - haskell-src-meta-mwotton
  - haskell-stack-trace-plugin
+  - haskell-to-elm
  - HaskellTorrent
  - HaskellTutorials
  - haskell-type-exts
@ -2755,6 +2758,7 @@ broken-packages:
  - linear-maps
  - linear-opengl
  - linearscan
+  - linear-smc
  - linear-vect
  - line-drawing
  - lines-of-action
@ -3183,6 +3187,7 @@ broken-packages:
  - nested-sequence
  - netclock
  - netease-fm
+  - net-mqtt-rpc
  - netrium
  - NetSNMP
  - netspec
@ -4511,6 +4516,7 @@ broken-packages:
  - streaming-png
  - streaming-utils
  - streaming-with
+  - streamly-examples
  - streamly-fsnotify
  - stream-monad
  - streamproc
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@ -564,6 +564,7 @@ dont-distribute-packages:
 - bip32
 - birch-beer
 - bird
+ - biscuit-servant
 - bit-array
 - bitcoin-address
 - bitcoin-api
@ -2344,6 +2345,7 @@ dont-distribute-packages:
 - polysemy-path
 - polysemy-plugin
 - polysemy-readline
+ - polysemy-req
 - polysemy-resume
 - polysemy-test
 - polysemy-time
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/interpreters/luajit/2.0.nix
+++ b/pkgs/development/interpreters/luajit/2.0.nix
@ -1,10 +1,10 @@
 { self, callPackage, lib }:
 callPackage ./default.nix {
  inherit self;
-  version = "2.0.5-2021-05-29";
-  rev = "c2cfa04231785116d9d198462830f41ef94147c0";
+  version = "2.0.5-2021-06-08";
+  rev = "98f95f69180d48ce49289d6428b46a9ccdd67a46";
  isStable = true;
-  sha256 = "1fw64pv0dvzb9bgr2zwcv9q8gqgsmfnvrcrmrdfgj4ncamgdnilj";
+  sha256 = "1pdmhk5syp0nir80xcnkf6xy2w5rwslak8hgmjpgaxzlnrjcgs7p";
  extraMeta = { # this isn't precise but it at least stops the useless Hydra build
    platforms = with lib; filter (p: p != "aarch64-linux")
      (platforms.linux ++ platforms.darwin);
--- a/pkgs/development/interpreters/luajit/2.1.nix
+++ b/pkgs/development/interpreters/luajit/2.1.nix
@ -1,8 +1,8 @@
 { self, callPackage }:
 callPackage ./default.nix {
  inherit self;
-  version = "2.1.0-2021-05-29";
-  rev = "839fb5bd72341d8e67b6cfc2053e2acffdb75567";
+  version = "2.1.0-2021-06-25";
+  rev = "e957737650e060d5bf1c2909b741cc3dffe073ac";
  isStable = false;
-  sha256 = "1gyzq4n0fwah0245wazv4c43q9in1mwbk3dhh6cb1ijnjcxp2bb6";
+  sha256 = "04i7n5xdd1nci4mv2p6bv71fq5b1nkswz12hcgirsxqbnkrlbbcj";
 }
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@ -253,26 +253,26 @@ let

 in {
  ruby_2_6 = generic {
-    version = rubyVersion "2" "6" "7" "";
+    version = rubyVersion "2" "6" "8" "";
    sha256 = {
-      src = "17m9qxalwhk95dw1qhgxbvr3kkcxs3h86yirfg5mwj35gy5pw8p4";
-      git = "08gvknanwdfsaj3lmcv1bdqjf9lldphzi7gmlv3cfa8ligx2vbap";
+      src = "0vfam28ifl6h2wxi6p70j0hm3f1pvsp432hf75m5j25wfy2vf1qq";
+      git = "0rc3n6sk8632r0libpv8jwslc7852hgk64rvbdrspc9razjwx21c";
    };
  };

  ruby_2_7 = generic {
-    version = rubyVersion "2" "7" "3" "";
+    version = rubyVersion "2" "7" "4" "";
    sha256 = {
-      src = "0f2kwn98n9h9hy1fd547s7d0a7ga8jjm4nh294bwiwnq65gaj9c9";
-      git = "0vxg9w4dgpw2ig5snxmkahvzdp2yh71w8qm49g35d5hqdsql7yrx";
+      src = "0nxwkxh7snmjqf787qsp4i33mxd1rbf9yzyfiky5k230i680jhrh";
+      git = "1prsrqwkla4k5japlm54k0j700j4824rg8z8kpswr9r3swrmrf5p";
    };
  };

  ruby_3_0 = generic {
-    version = rubyVersion "3" "0" "1" "";
+    version = rubyVersion "3" "0" "2" "";
    sha256 = {
-      src = "09vpnxxcxc46qv40xbxr9xkdpbgb0imdy25l2vpsxxlr47djb61n";
-      git = "0vricyhnnczcbsgvz65pdhi9yx1i34zarbjlc5y5mcmj01y9r7ar";
+      src = "1wg6yyzc6arzikcy48igqbxfcdc79bmfpiyfi9m9j1lzmphdx1ah";
+      git = "1kbkxqichi11vli080jgyvjf2xgnlbl9l2f2n1hv4s8b31gjib3r";
    };
  };
 }
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@ -1,17 +1,17 @@
 { patchSet, useRailsExpress, ops, patchLevel, fetchpatch }:

 {
-  "2.6.7" = ops useRailsExpress [
+  "2.6.8" = ops useRailsExpress [
    "${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
    "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch"
    "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch"
  ];
-  "2.7.3" = ops useRailsExpress [
+  "2.7.4" = ops useRailsExpress [
    "${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
    "${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch"
    "${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch"
  ];
-  "3.0.1" = ops useRailsExpress [
+  "3.0.2" = ops useRailsExpress [
    "${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch"
    "${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch"
  ];
--- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix
+++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
@ -3,6 +3,6 @@
 fetchFromGitHub {
  owner  = "skaes";
  repo   = "rvm-patchsets";
-  rev    = "28c6469ce841ff3033c376e78a7043009a3bdc5c";
-  sha256 = "0kh08hahrwif61sq0qlvgyqiymxi8c8h2dw4s3ln4aq696k4gba9";
+  rev    = "0251817e2b9d5f73370bbbb12fdf7f7089bd1ac3";
+  sha256 = "1biiq5xzzdfb4hr1sgmx14i2nr05xa9w21pc7dl8c5n4f2ilg8ss";
 }
--- a/pkgs/development/libraries/cpp-utilities/default.nix
+++ b/pkgs/development/libraries/cpp-utilities/default.nix
@ -7,13 +7,13 @@

 stdenv.mkDerivation rec {
  pname = "cpp-utilities";
-  version = "5.10.4";
+  version = "5.10.5";

  src = fetchFromGitHub {
    owner = "Martchus";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-pZh/NbTzQR2kjMeauv1HcRn0hDBaCNRbaZ3+1qs5rxU=";
+    sha256 = "sha256-1GAZKMfA2cB/7/TZfV+WOvjlu0sWq1loOauX4EfHogA=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/libraries/fcft/default.nix
+++ b/pkgs/development/libraries/fcft/default.nix
@ -6,13 +6,14 @@

 stdenv.mkDerivation rec {
  pname = "fcft";
-  version = "2.4.1";
+  version = "2.4.2";

  src = fetchzip {
    url = "https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz";
-    sha256 = "sha256-QxAp6pnZPLPwarurbKovz0BVOO4XdckBzjB65XCBPAM=";
+    sha256 = "01zvc8519fcg14nmcx3iqap9jnspcnr6pvlr59ipqxs0jprnrxl2";
  };

+  depsBuildBuild = [ pkg-config ];
  nativeBuildInputs = [ pkg-config meson ninja scdoc ];
  buildInputs = [ freetype fontconfig pixman tllist ]
    ++ lib.optional withHarfBuzz harfbuzz;
--- a/pkgs/development/libraries/notcurses/default.nix
+++ b/pkgs/development/libraries/notcurses/default.nix
@ -3,7 +3,7 @@
  multimediaSupport ? true
 }:
 let
-  version = "2.2.4";
+  version = "2.3.8";
 in
 stdenv.mkDerivation {
  pname = "notcurses";
@ -24,7 +24,7 @@ stdenv.mkDerivation {
    owner  = "dankamongmen";
    repo   = "notcurses";
    rev    = "v${version}";
-    sha256 = "sha256-FScs6eQxhRMEyPDSD+50RO1B6DIAo+KnvHP3RO2oAnw=";
+    sha256 = "sha256-CTMFXTmOnBUCm0KdVNBoDT08arr01XTHdELFiTayk3E=";
  };

  meta = {
--- a/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch
+++ b/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch
@ -2,16 +2,13 @@ diff --git a/meson_options.txt b/meson_options.txt
 index 93b5e2a9..1b915ac3 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -13,6 +13,9 @@ option('media-session',
-        description: 'Build and install pipewire-media-session',
+@@ -200,3 +200,6 @@ option('media-session',
        type: 'feature',
        value: 'auto')
 +option('media-session-prefix',
 +       description: 'Install directory for pipewire-media-session and its support files',
 +       type: 'string')
- option('man',
-        description: 'Build manpages',
-        type: 'feature',
+ option('session-managers',
 diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build
 index 1edebb2d..251270eb 100644
 --- a/src/daemon/systemd/user/meson.build
--- a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch
+++ b/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch
@ -6,8 +6,8 @@ index bbafa134..227d3e06 100644
             # access.allowed to list an array of paths of allowed
             # apps.
             #access.allowed = [
-            #    @media_session_path@
-+            #    <media_session_path>
+-            #    @session_manager_path@
+            #    <session_manager_path>
             #]
 
             # An array of rejected paths.
@ -15,8 +15,8 @@ index bbafa134..227d3e06 100644
     # but it is better to start it as a systemd service.
     # Run the session manager with -h for options.
     #
-    @comment@{ path = "@media_session_path@"  args = "" }
-+    @comment@{ path = "<media_session_path>"  args = "" }
+-    @comment@{ path = "@session_manager_path@"  args = "@session_manager_args@" }
+    @comment@{ path = "<session_manager_path>"  args = "@session_manager_args@" }
     #
     # You can optionally start the pulseaudio-server here as well
     # but it is better to start it as a systemd service.
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@ -14,6 +14,7 @@
 , dbus
 , alsa-lib
 , libjack2
+, libusb1
 , udev
 , libva
 , libsndfile
@ -43,10 +44,11 @@ let
  };

  mesonEnable = b: if b then "enabled" else "disabled";
+  mesonList = l: "[" + lib.concatStringsSep "," l + "]";

  self = stdenv.mkDerivation rec {
    pname = "pipewire";
-    version = "0.3.30";
+    version = "0.3.31";

    outputs = [
      "out"
@ -64,7 +66,7 @@ let
      owner = "pipewire";
      repo = "pipewire";
      rev = version;
-      sha256 = "sha256-DnaPvZoDaegjtJNKBmCJEAZe5FQBnSER79FPnxiWQUE=";
+      sha256 = "1dirz69ami7bcgy6hhh0ffi9gzwcy9idg94nvknwvwkjw4zm8m79";
    };

    patches = [
@ -96,6 +98,7 @@ let
      dbus
      glib
      libjack2
+      libusb1
      libsndfile
      ncurses
      udev
@ -122,6 +125,7 @@ let
      "-Dmedia-session-prefix=${placeholder "mediaSession"}"
      "-Dlibjack-path=${placeholder "jack"}/lib"
      "-Dlibcamera=disabled"
+      "-Droc=disabled"
      "-Dlibpulse=${mesonEnable pulseTunnelSupport}"
      "-Davahi=${mesonEnable zeroconfSupport}"
      "-Dgstreamer=${mesonEnable gstreamerSupport}"
@ -133,6 +137,7 @@ let
      "-Dbluez5-backend-hsphfpd=${mesonEnable hsphfpdSupport}"
      "-Dsysconfdir=/etc"
      "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire"
+      "-Dsession-managers=${mesonList (lib.optional withMediaSession "media-session")}"
    ];

    FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file
@ -187,6 +192,7 @@ let
          paths-out-media-session = [
            "nix-support/etc/pipewire/media-session.d/alsa-monitor.conf.json"
            "nix-support/etc/pipewire/media-session.d/bluez-monitor.conf.json"
+            "nix-support/etc/pipewire/media-session.d/bluez-hardware.conf.json"
            "nix-support/etc/pipewire/media-session.d/media-session.conf.json"
            "nix-support/etc/pipewire/media-session.d/v4l2-monitor.conf.json"
          ];
--- a/pkgs/development/python-modules/aiopg/default.nix
+++ b/pkgs/development/python-modules/aiopg/default.nix
@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "aiopg";
-  version = "1.3.0";
+  version = "1.3.1";
  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = "aio-libs";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-/J53WqBag4ArSF7wETvmoBUtgNqp4eYGH0ytipiSKBI=";
+    sha256 = "sha256-kAkxulAMtLeL3IAuIVvZtsN5RxHWV/qHyFIYu9Odn34=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/dependency-injector/default.nix
+++ b/pkgs/development/python-modules/dependency-injector/default.nix
@ -16,13 +16,13 @@

 buildPythonPackage rec {
  pname = "dependency-injector";
-  version = "4.32.2";
+  version = "4.34.0";

  src = fetchFromGitHub {
    owner = "ets-labs";
    repo = "python-dependency-injector";
    rev = version;
-    sha256 = "1gkkka0hl2hl4axf3gfm58mzv92bg0frr5jikw8g32hd4q4aagcg";
+    sha256 = "sha256-MI0+saRe4Zi77otVPGYxrX9z8Jc5K1A1sCxHBS0uta0=";
  };

  propagatedBuildInputs = [
@ -42,6 +42,11 @@ buildPythonPackage rec {
    pyyaml
  ];

+  postPatch = ''
+    substituteInPlace requirements.txt \
+      --replace "six>=1.7.0,<=1.15.0" "six"
+  '';
+
  disabledTestPaths = [
    # There is no unique identifier to disable the one failing test
    "tests/unit/ext/test_aiohttp_py35.py"
--- a/pkgs/development/python-modules/distutils_extra/default.nix
+++ b/pkgs/development/python-modules/distutils_extra/default.nix
@ -5,17 +5,22 @@

 buildPythonPackage rec {
  pname = "distutils-extra";
-  version = "2.39";
+  version = "2.45";

  src = fetchurl {
-    url = "https://launchpad.net/python-distutils-extra/trunk/${version}/+download/python-${pname}-${version}.tar.gz";
-    sha256 = "1bv3h2p9ffbzyddhi5sccsfwrm3i6yxzn0m06fdxkj2zsvs28gvj";
+    url = "https://salsa.debian.org/python-team/modules/python-distutils-extra/-/archive/${version}/python-${pname}-${version}.tar.bz2";
+    sha256 = "1aifizd4nkvdnkwdna7i6xgjcqi1cf228bg8kmnwz67f5rflk3z8";
  };

+  # Tests are out-dated as the last upstream release is from 2016
+  doCheck = false;
+
+  pythonImportsCheck = [ "DistUtilsExtra" ];
+
  meta = with lib; {
-    homepage = "https://launchpad.net/python-distutils-extra";
    description = "Enhancements to Python's distutils";
-    license = licenses.gpl2;
+    homepage = "https://launchpad.net/python-distutils-extra";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ fab ];
  };
-
 }
--- a/pkgs/development/python-modules/furl/default.nix
+++ b/pkgs/development/python-modules/furl/default.nix
@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, fetchpatch
 , flake8
 , orderedmultidict
 , pytestCheckHook
@ -10,21 +9,13 @@

 buildPythonPackage rec {
  pname = "furl";
-  version = "2.1.0";
+  version = "2.1.2";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "08dnw3bs1mk0f1ccn466a5a7fi1ivwrp0jspav9arqpf3wd27q60";
+    sha256 = "sha256-99ujPq++59vIOWNTSyXnL4FsztSKxTGR7mC/zGKTORg=";
  };

-  patches = [
-    (fetchpatch {
-      name = "tests_overcome_bpo42967.patch";
-      url = "https://github.com/gruns/furl/files/6030371/tests_overcome_bpo42967.patch.txt";
-      sha256 = "1l0lxmcp9x73kxy0ky2bh7zxa4n1cf1qxyyax97n90d1s3dc7k2q";
-    })
-  ];
-
  propagatedBuildInputs = [
    orderedmultidict
    six
@ -35,11 +26,6 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

-  disabledTests = [
-     # see https://github.com/gruns/furl/issues/121
-    "join"
-  ];
-
  pythonImportsCheck = [ "furl" ];

  meta = with lib; {
--- a/pkgs/development/python-modules/graphene/default.nix
+++ b/pkgs/development/python-modules/graphene/default.nix
@ -25,9 +25,8 @@ buildPythonPackage rec {
    sha256 = "sha256-bVCCLPnV5F8PqLMg3GwcpwpGldrxsU+WryL6gj6y338=";
  };

-  # Allow later aniso8601 releases
-  # https://github.com/graphql-python/graphene/pull/1331
  patches = [ (fetchpatch {
+    # Allow later aniso8601 releases, https://github.com/graphql-python/graphene/pull/1331
    url = "https://github.com/graphql-python/graphene/commit/26b16f75b125e35eeb2274b7be503ec29f2e8a45.patch";
    sha256 = "qm96pNOoxPieEy1CFZpa2Mx010pY3QU/vRyuL0qO3Tk=";
  }) ];
--- a/pkgs/development/python-modules/ibm-watson/default.nix
+++ b/pkgs/development/python-modules/ibm-watson/default.nix
@ -14,13 +14,13 @@

 buildPythonPackage rec {
  pname = "ibm-watson";
-  version = "5.2.1";
+  version = "5.2.2";

  src = fetchFromGitHub {
    owner = "watson-developer-cloud";
    repo = "python-sdk";
    rev = "v${version}";
-    sha256 = "sha256-0F4BZf0D0dqGm0OkJaSgmH5RxEA8KCzOlbnhIQVsgzQ=";
+    sha256 = "sha256-bK6lcTKAVwAJDb5LqKRWR/4wcOKx7bRwWYC+WB5qJE4=";
  };

  checkInputs = [
--- a/pkgs/development/python-modules/maestral/default.nix
+++ b/pkgs/development/python-modules/maestral/default.nix
@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "maestral";
-  version = "1.4.5";
+  version = "1.4.6";
  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = "SamSchott";
    repo = "maestral";
    rev = "v${version}";
-    sha256 = "sha256-kyOBF+qsl/+9u0P+EmfxbuJNGMqPSLCWJUlcZMyKJH4=";
+    sha256 = "sha256-kaRcM8Z0xeDp3JYputKZmzTfYYq2oKpF7AM6ciFF7I4=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/mcstatus/default.nix
+++ b/pkgs/development/python-modules/mcstatus/default.nix
@ -13,14 +13,14 @@

 buildPythonPackage rec {
  pname = "mcstatus";
-  version = "6.2.0";
+  version = "6.4.0";
  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = "Dinnerbone";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-o5JVj4Tt5+VOjDC0TDlVuVbDUQPvZGX5Zeoz0vVxPJ8=";
+    sha256 = "sha256-pJ5TY9tbdhVW+kou+n5fMgCdHVBK6brBrlGIuO+VIK0=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/minio/default.nix
+++ b/pkgs/development/python-modules/minio/default.nix
@ -16,14 +16,14 @@

 buildPythonPackage rec {
  pname = "minio";
-  version = "7.0.4";
+  version = "7.1.0";
  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = "minio";
    repo = "minio-py";
    rev = version;
-    sha256 = "sha256-4O6WhBoMNpqv1OEewkbA5a8hYH56liF7GrfxkooQ6Fo=";
+    sha256 = "sha256-0N9hPjGGYHFyGzEWWDnW7KsPQtv0y/j/lCBLNC9IlpA=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@ -1,18 +1,30 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+}:

 buildPythonPackage rec {
  pname = "phonenumbers";
-  version = "8.12.25";
+  version = "8.12.26";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "de4db4e2582f989a9cbae54364a647b24a72a7b0126be50d8356cf02217dc6c9";
+    sha256 = "sha256-Zbq269vg7FGWx0YmlJdI21M30jiVqrwe+PXXKEeHmYo=";
  };

+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [ "tests/*.py" ];
+
+  pythonImportsCheck = [ "phonenumbers" ];
+
  meta = with lib; {
-    description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers";
-    homepage    = "https://github.com/daviddrysdale/python-phonenumbers";
-    license     = licenses.asl20;
+    description = "Python module for handling international phone numbers";
+    homepage = "https://github.com/daviddrysdale/python-phonenumbers";
+    license = licenses.asl20;
    maintainers = with maintainers; [ fadenb ];
  };
 }
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@ -19,13 +19,13 @@

 buildPythonPackage rec {
  pname = "plugwise";
-  version = "0.10.0";
+  version = "0.11.1";

  src = fetchFromGitHub {
    owner = pname;
    repo = "python-plugwise";
    rev = version;
-    sha256 = "sha256-M0Zwao8I8PRxxF9xvtzFeCFK9+eMlXYcWJarfHSGAlw=";
+    sha256 = "sha256-b00jfPZTVRI7BRpUHI2NjcydkykC/1HjmVzDaIech8c=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/pyftdi/default.nix
+++ b/pkgs/development/python-modules/pyftdi/default.nix
@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "pyftdi";
-  version = "0.53.1";
+  version = "0.53.2";
  disabled = pythonOlder "3.5";

  src = fetchFromGitHub {
    owner = "eblot";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-lpNe+8DhyfVuClGcjWIA6pnfh+NwdlBGffjRH62K4uw=";
+    sha256 = "sha256-6cTQlYG/z8ZulMZLggGQ+PhuOOclWM0/+cfy0SF6dls=";
  };

  propagatedBuildInputs = [ pyusb pyserial ];
--- a/pkgs/development/python-modules/pylutron/default.nix
+++ b/pkgs/development/python-modules/pylutron/default.nix
@ -5,11 +5,11 @@

 buildPythonPackage rec {
  pname = "pylutron";
-  version = "0.2.7";
+  version = "0.2.8";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-wwVTDpoRT/TIJhoRap0T01a8gmYt+vfKc+ATRs6phB4=";
+    sha256 = "sha256-Jg2waoIxvBvX+hoAgt/yoM87XdShCHQOZXbsHG3b4cw=";
  };

  # Project has no tests
--- a/pkgs/development/python-modules/pyswitchbot/default.nix
+++ b/pkgs/development/python-modules/pyswitchbot/default.nix
@ -6,13 +6,13 @@

 buildPythonPackage rec {
  pname = "pyswitchbot";
-  version = "0.9.1";
+  version = "0.11.0";

  src = fetchFromGitHub {
    owner = "Danielhiversen";
    repo = "pySwitchbot";
    rev = version;
-    sha256 = "16p11fmyms4q93m3rna76nkp2la9m8lmfmaflbvga666vljwfw6v";
+    sha256 = "sha256-YqXR6zL8rM2p6YqK8BX82F9HZHgfpfEU4qBiVSud0hw=";
  };

  propagatedBuildInputs = [ bluepy ];
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@ -29,11 +29,11 @@

 buildPythonPackage rec {
  pname = "sentry-sdk";
-  version = "1.1.0";
+  version = "1.2.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-wSJ9ONyjFbo1GCNz8SnD4nIujtmZ5SWE5qyn0oeHBzk=";
+    sha256 = "sha256-mQetvdMKVbgYkUUSzBQ+a+rguzuniyZJ9LB5dS6w5CQ=";
  };

  checkInputs = [ blinker botocore chalice django flask tornado bottle rq falcon sqlalchemy werkzeug trytond
--- a/pkgs/development/python-modules/starlette/default.nix
+++ b/pkgs/development/python-modules/starlette/default.nix
@ -53,9 +53,13 @@ buildPythonPackage rec {
    typing-extensions
  ];

-  # fails to import graphql, but integrated graphql support is about to
-  # be removed in 0.15, see https://github.com/encode/starlette/pull/1135.
-  disabledTestPaths = [ "tests/test_graphql.py" ];
+  disabledTestPaths = [
+    # fails to import graphql, but integrated graphql support is about to
+    # be removed in 0.15, see https://github.com/encode/starlette/pull/1135.
+    "tests/test_graphql.py"
+    # contextfunction was removed in Jinja 3.1
+    "tests/test_templates.py"
+  ];

  pythonImportsCheck = [ "starlette" ];

--- a/pkgs/development/ruby-modules/solargraph/Gemfile
+++ b/pkgs/development/ruby-modules/solargraph/Gemfile
@ -1,2 +0,0 @@
-source 'https://rubygems.org'
-gem 'solargraph'
--- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock
+++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
@ -1,64 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.1)
-    backport (1.1.2)
-    benchmark (0.1.1)
-    e2mmap (0.1.0)
-    jaro_winkler (1.5.4)
-    kramdown (2.3.0)
-      rexml
-    kramdown-parser-gfm (1.1.0)
-      kramdown (~> 2.0)
-    mini_portile2 (2.5.0)
-    nokogiri (1.11.1)
-      mini_portile2 (~> 2.5.0)
-      racc (~> 1.4)
-    parallel (1.20.1)
-    parser (2.7.2.0)
-      ast (~> 2.4.1)
-    racc (1.5.2)
-    rainbow (3.0.0)
-    regexp_parser (2.0.3)
-    reverse_markdown (2.0.0)
-      nokogiri
-    rexml (3.2.4)
-    rubocop (1.7.0)
-      parallel (~> 1.10)
-      parser (>= 2.7.1.5)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.4.0)
-      parser (>= 2.7.1.5)
-    ruby-progressbar (1.11.0)
-    solargraph (0.40.1)
-      backport (~> 1.1)
-      benchmark
-      bundler (>= 1.17.2)
-      e2mmap
-      jaro_winkler (~> 1.5)
-      kramdown (~> 2.3)
-      kramdown-parser-gfm (~> 1.1)
-      parser (~> 2.3)
-      reverse_markdown (>= 1.0.5, < 3)
-      rubocop (>= 0.52)
-      thor (~> 1.0)
-      tilt (~> 2.0)
-      yard (~> 0.9, >= 0.9.24)
-    thor (1.0.1)
-    tilt (2.0.10)
-    unicode-display_width (1.7.0)
-    yard (0.9.26)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  solargraph
-
-BUNDLED WITH
-   2.1.4
--- a/pkgs/development/ruby-modules/solargraph/default.nix
+++ b/pkgs/development/ruby-modules/solargraph/default.nix
@ -1,16 +0,0 @@
-{ lib, bundlerApp, bundlerUpdateScript }:
-
-bundlerApp {
-  pname = "solargraph";
-  exes = [ "solargraph" ];
-  gemdir = ./.;
-
-  passthru.updateScript = bundlerUpdateScript "solargraph";
-
-  meta = with lib; {
-    description = "A Ruby language server";
-    homepage = "https://solargraph.org/";
-    license = licenses.mit;
-    maintainers = with maintainers; [ nicknovitski angristan ];
-  };
-}
--- a/pkgs/development/ruby-modules/solargraph/gemset.nix
+++ b/pkgs/development/ruby-modules/solargraph/gemset.nix
@ -1,250 +0,0 @@
-{
-  ast = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a";
-      type = "gem";
-    };
-    version = "2.4.1";
-  };
-  backport = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1xmjljpyx5ly078gi0lmmgkv4y0msxxa3hmv74bzxzp3l8qbn5vc";
-      type = "gem";
-    };
-    version = "1.1.2";
-  };
-  benchmark = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1jvrl7400fv7v2jjri1r7ilj3sri36hzipwwgpn5psib4c9c59c6";
-      type = "gem";
-    };
-    version = "0.1.1";
-  };
-  e2mmap = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0n8gxjb63dck3vrmsdcqqll7xs7f3wk78mw8w0gdk9wp5nx6pvj5";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
-  jaro_winkler = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh";
-      type = "gem";
-    };
-    version = "1.5.4";
-  };
-  kramdown = {
-    dependencies = ["rexml"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7";
-      type = "gem";
-    };
-    version = "2.3.0";
-  };
-  kramdown-parser-gfm = {
-    dependencies = ["kramdown"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv";
-      type = "gem";
-    };
-    version = "1.1.0";
-  };
-  mini_portile2 = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
-      type = "gem";
-    };
-    version = "2.5.0";
-  };
-  nokogiri = {
-    dependencies = ["mini_portile2" "racc"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
-      type = "gem";
-    };
-    version = "1.11.1";
-  };
-  parallel = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd";
-      type = "gem";
-    };
-    version = "1.20.1";
-  };
-  parser = {
-    dependencies = ["ast"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z";
-      type = "gem";
-    };
-    version = "2.7.2.0";
-  };
-  racc = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
-      type = "gem";
-    };
-    version = "1.5.2";
-  };
-  rainbow = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
-      type = "gem";
-    };
-    version = "3.0.0";
-  };
-  regexp_parser = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0zm86k9q8m5jkcnpb1f93wsvc57saldfj8czxkx1aw031i95inip";
-      type = "gem";
-    };
-    version = "2.0.3";
-  };
-  reverse_markdown = {
-    dependencies = ["nokogiri"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0w6fv779542vdliq2kmikfhymjv55z8mgzblkfjdy2agl07da9c6";
-      type = "gem";
-    };
-    version = "2.0.0";
-  };
-  rexml = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3";
-      type = "gem";
-    };
-    version = "3.2.4";
-  };
-  rubocop = {
-    dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "12kkyzyzh30mi9xs52lc1pjki1al4x9acdaikj40wslhpwp1ng1l";
-      type = "gem";
-    };
-    version = "1.7.0";
-  };
-  rubocop-ast = {
-    dependencies = ["parser"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1qvfp567aprjgcwj757p55ynj0dx2b3c3hd76za9z3c43sphprcj";
-      type = "gem";
-    };
-    version = "1.4.0";
-  };
-  ruby-progressbar = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc";
-      type = "gem";
-    };
-    version = "1.11.0";
-  };
-  solargraph = {
-    dependencies = ["backport" "benchmark" "e2mmap" "jaro_winkler" "kramdown" "kramdown-parser-gfm" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0q0dh4da4qygn92vjwqz0w6m4pdhs2zdmrx3zlmxmghizh32ghk7";
-      type = "gem";
-    };
-    version = "0.40.1";
-  };
-  thor = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
-  tilt = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv";
-      type = "gem";
-    };
-    version = "2.0.10";
-  };
-  unicode-display_width = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
-      type = "gem";
-    };
-    version = "1.7.0";
-  };
-  yard = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0qzr5j1a1cafv81ib3i51qyl8jnmwdxlqi3kbiraldzpbjh4ln9h";
-      type = "gem";
-    };
-    version = "0.9.26";
-  };
-}
--- a/pkgs/development/ruby-modules/with-packages/Gemfile
+++ b/pkgs/development/ruby-modules/with-packages/Gemfile
@ -126,6 +126,7 @@ source 'https://rubygems.org' do
  gem 'semian'
  gem 'sequel'
  gem 'sequel_pg'
+  gem 'solargraph'
  gem 'simplecov'
  gem 'sinatra'
  gem 'slop'
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@ -7,11 +7,11 @@
 , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin)
 , useOpenSSL ? !isBootstrap, openssl
 , useNcurses ? false, ncurses
-, withQt5 ? false, qtbase
+, withQt5 ? false, qtbase, wrapQtAppsHook
 , buildDocs ? (!isBootstrap && (useNcurses || withQt5)), sphinx, texinfo
 }:

-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
  pname = "cmake"
          + lib.optionalString isBootstrap "-boot"
          + lib.optionalString useNcurses "-cursesUI"
@ -45,7 +45,8 @@ stdenv.mkDerivation (rec {
  depsBuildBuild = [ buildPackages.stdenv.cc ];

  nativeBuildInputs = [ setupHook pkg-config ]
-    ++ lib.optionals buildDocs [ texinfo ];
+    ++ lib.optionals buildDocs [ texinfo ]
+    ++ lib.optionals withQt5 [ wrapQtAppsHook ];

  buildInputs = []
    ++ lib.optionals useSharedLibraries [ bzip2 curlMinimal expat libarchive xz zlib libuv rhash ]
@ -130,5 +131,4 @@ stdenv.mkDerivation (rec {
    maintainers = with maintainers; [ ttuegel lnl7 ];
    license = licenses.bsd3;
  };
-} // (if withQt5 then { dontWrapQtApps = true; } else {})
-)
+}
--- a/pkgs/development/tools/efm-langserver/default.nix
+++ b/pkgs/development/tools/efm-langserver/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "efm-langserver";
-  version = "0.0.31";
+  version = "0.0.32";

  src = fetchFromGitHub {
    owner = "mattn";
    repo = "efm-langserver";
    rev = "v${version}";
-    sha256 = "sha256-4NdD+WwvlqfJdPqXTz9LUyriJyLPppi8jH6dxYupe6A=";
+    sha256 = "sha256-zjjzdHlWEDDmPaDPuyk1ZoXwEFBogf51KjOmRmhFAdc=";
  };

  vendorSha256 = "sha256-tca+1SRrFyvU8ttHmfMFiGXd1A8rQSEWm1Mc2qp0EfI=";
--- a/pkgs/development/tools/esbuild/default.nix
+++ b/pkgs/development/tools/esbuild/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "esbuild";
-  version = "0.12.14";
+  version = "0.12.15";

  src = fetchFromGitHub {
    owner = "evanw";
    repo = "esbuild";
    rev = "v${version}";
-    sha256 = "sha256-+qFR5XGV1LSCY8AR7gd269UcOwlL5hkvKiQEhdsqIJc=";
+    sha256 = "sha256-Ikt8kBkwI9AQrWp9j4Zaf+BqGVcyhyagBDjTGZm/dzQ=";
  };

  vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";
--- a/pkgs/development/tools/kubectx/default.nix
+++ b/pkgs/development/tools/kubectx/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "kubectx";
-  version = "0.9.3";
+  version = "0.9.4";

  src = fetchFromGitHub {
    owner = "ahmetb";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-anTogloat0YJN6LR6mww5IPwokHYoDY6L7i2pMzI8/M=";
+    sha256 = "sha256-WY0zFt76mvdzk/s2Rzqys8n+DVw6qg7V6Y8JncOUVCM=";
  };

  vendorSha256 = "sha256-4sQaqC0BOsDfWH3cHy2EMQNMq6qiAcbV+RwxCdcSxsg=";
--- a/pkgs/development/tools/literate-programming/funnelweb/default.nix
+++ b/pkgs/development/tools/literate-programming/funnelweb/default.nix
@ -1,8 +1,9 @@
-{lib, stdenv, fetchurl}:
+{ lib, stdenv, fetchurl }:

 stdenv.mkDerivation rec {
+  pname = "funnelweb";
+  version = "3.20";

-  name = "funnelweb-${meta.version}";
  src = fetchurl {
    url = "http://www.ross.net/funnelweb/download/funnelweb_v320/funnelweb_v320_source.tar.gz";
    sha256 = "0zqhys0j9gabrd12mnk8ibblpc8dal4kbl8vnhxmdlplsdpwn4wg";
--- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix
+++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix
@ -1,14 +1,14 @@
 { lib, stdenv, fetchgit, cmake, pcre, doxygen }:

 stdenv.mkDerivation rec {
-  name = "editorconfig-core-c-${meta.version}";
+  pname = "editorconfig-core-c";
+  version = "0.12.1";

  src = fetchgit {
    url = "https://github.com/editorconfig/editorconfig-core-c.git";
-    rev = "v${meta.version}";
+    rev = "v${version}";
    sha256 = "0awpb63ci85kal3pnlj2b54bay8igj1rbc13d8gqkvidlb51nnx4";
    fetchSubmodules = true;
-    inherit name;
  };

  buildInputs = [ pcre ];
@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
    '';
    downloadPage = "https://github.com/editorconfig/editorconfig-core-c";
    license = with licenses; [ bsd2 bsd3 ];
-    version = "0.12.1";
    maintainers = with maintainers; [ dochang ];
    platforms = platforms.unix;
  };
--- a/pkgs/development/tools/misc/rolespec/default.nix
+++ b/pkgs/development/tools/misc/rolespec/default.nix
@ -1,15 +1,14 @@
 { lib, stdenv, fetchFromGitHub, makeWrapper }:

 stdenv.mkDerivation rec {
-
-  name = "rolespec-${meta.version}";
+  pname = "rolespec";
+  version = "20161104";

  src = fetchFromGitHub {
    owner = "nickjj";
    repo = "rolespec";
    rev = "d9ee530cd709168882059776c482fc37f46cb743";
    sha256 = "1jkidw6aqr0zfqwmcvlpi9qa140z2pxcfsd43xm5ikx6jcwjdrzl";
-    inherit name;
  };

  nativeBuildInputs = [ makeWrapper ];
@ -41,9 +40,7 @@ stdenv.mkDerivation rec {
    '';
    downloadPage = "https://github.com/nickjj/rolespec";
    license = licenses.gpl3;
-    version = "20161104";
    maintainers = [ maintainers.dochang ];
    platforms = platforms.unix;
  };
-
 }
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@ -5,9 +5,9 @@
 let
  # NOTE: bumping the version and updating the hash is insufficient;
  # you must use bundix to generate a new gemset.nix in the Vagrant source.
-  version = "2.2.16";
+  version = "2.2.17";
  url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
-  sha256 = "sha256-qzxguxKy2pFv0HMZKEnytdPyJPlf6/NTghIkfEzeKNY=";
+  sha256 = "sha256-T48ui7jgq9ni3pC09Jd2WzkT9PBaJ+SUDfcXA5QMjM8=";

  deps = bundlerEnv rec {
    name = "${pname}-${version}";
--- a/pkgs/development/tools/vagrant/gemset.nix
+++ b/pkgs/development/tools/vagrant/gemset.nix
@ -24,20 +24,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "08hd3d2lfi19cns4d6wkq51scasn17l83fgbzbjjk3dqccz4rg3j";
+      sha256 = "1lvcp8bsd35g57f7wz4jigcw2sryzzwrpcgjwwf3chmjrjcww5in";
      type = "gem";
    };
-    version = "4.0.0";
+    version = "4.1.0";
  };
  concurrent-ruby = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
+      sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
      type = "gem";
    };
-    version = "1.1.8";
+    version = "1.1.9";
  };
  ed25519 = {
    groups = ["default"];
@ -64,20 +64,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "19g5nvkycnkzqq4mqn1zjznq9adrlv2jz0dr9w10cbn42hhqpiz7";
+      sha256 = "186sra2bww83wa245mhmm57ngdn4w2k2x39iqkmxasjhibg5jsbl";
      type = "gem";
    };
-    version = "0.81.0";
+    version = "0.84.0";
  };
  ffi = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432";
+      sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq";
      type = "gem";
    };
-    version = "1.15.0";
+    version = "1.15.3";
  };
  gssapi = {
    dependencies = ["ffi"];
@ -190,10 +190,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi";
+      sha256 = "0dlxwc75iy0dj23x824cxpvpa7c8aqcpskksrmb32j6m66h5mkcy";
      type = "gem";
    };
-    version = "3.2021.0225";
+    version = "3.2021.0704";
  };
  multi_json = {
    groups = ["default"];
@ -211,10 +211,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j";
+      sha256 = "0b4h3ip8d1gkrc0znnw54hbxillk73mdnaf5pz330lmrcl1wiilg";
      type = "gem";
    };
-    version = "1.2.1";
+    version = "3.0.0";
  };
  net-sftp = {
    dependencies = ["net-ssh"];
@ -252,10 +252,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1k9bsj7ni0g2fd7scyyy1sk9dy2pg9akniahab0iznvjmhn54h87";
+      sha256 = "1qsx9c4jr11vr3a9s5j83avczx9qn9rjaf32gxpc2v451hvbc0is";
      type = "gem";
    };
-    version = "0.10.4";
+    version = "0.11.0";
  };
  rb-inotify = {
    dependencies = ["ffi"];
@ -279,6 +279,16 @@
    };
    version = "0.2.6";
  };
+  rexml = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
+      type = "gem";
+    };
+    version = "3.2.5";
+  };
  rubyntlm = {
    groups = ["default"];
    platforms = [];
@ -294,10 +304,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji";
+      sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
      type = "gem";
    };
-    version = "2.3.0";
+    version = "2.3.2";
  };
  vagrant_cloud = {
    dependencies = ["excon" "log4r"];
--- a/pkgs/development/web/cypress/default.nix
+++ b/pkgs/development/web/cypress/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "cypress";
-  version = "7.5.0";
+  version = "7.7.0";

  src = fetchzip {
    url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
-    sha256 = "07i475b17v8qazdq6qzjqsdfpvhg1b8x1p5a51hwhcxaym3p5njj";
+    sha256 = "1mr46raha5aqi8ba0cqvyil5z4vcr46hnxqqmpk3fkrr8awd2897";
  };

  passthru.updateScript = ./update.sh;
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@ -17,15 +17,15 @@

 rustPlatform.buildRustPackage rec {
  pname = "deno";
-  version = "1.11.3";
+  version = "1.11.5";

  src = fetchFromGitHub {
    owner = "denoland";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-Ru75eyyyaaFDD71AzDE5kgLsiB7thjqrJvvnA/PdvrA=";
+    sha256 = "sha256-DrmdIWaWkOQeghhsnowkdgPA+z4+L2MTs7DNyeqDi5w=";
  };
-  cargoSha256 = "sha256-8UnsmIDdFEKp4diJ6Cr/fsbPKlw7wGHmGjXu5oqh2HI=";
+  cargoSha256 = "sha256-E0qcy+/o8q9dv3KJjNkI+VNa5MBWzwla2Dz8niwvPCw=";

  # Install completions post-install
  nativeBuildInputs = [ installShellFiles ];
--- a/pkgs/games/katago/default.nix
+++ b/pkgs/games/katago/default.nix
@ -34,7 +34,7 @@ let
 in env.mkDerivation rec {
  pname = "katago";
  version = "1.9.1";
-  githash = "b846bddd88fbc5353e4a93fa514f6cbf45358362";
+  githash = "c3220a5a404af835792c476f3f24904e4b799444";

  src = fetchFromGitHub {
    owner = "lightvector";
--- a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix
@ -1,10 +1,11 @@
 { coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper, mfcl2700dnlpr, perl, lib, stdenv }:

 stdenv.mkDerivation rec {
-  name = "mfcl2700dncupswrapper-${meta.version}";
+  pname = "mfcl2700dncupswrapper";
+  version = "3.2.0-1";

  src = fetchurl {
-    url = "https://download.brother.com/welcome/dlf102086/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf102086/mfcl2700dncupswrapper-${version}.i386.deb";
    sha256 = "07w48mah0xbv4h8vsh1qd5cd4b463bx8y6gc5x9pfgsxsy6h6da1";
  };

@ -39,6 +40,5 @@ stdenv.mkDerivation rec {
    license = lib.licenses.gpl2Plus;
    maintainers = [ lib.maintainers.tv ];
    platforms = lib.platforms.linux;
-    version = "3.2.0-1";
  };
 }
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@ -101,7 +101,12 @@ python3Packages.buildPythonApplication {
    ./hplip-3.20.11-nixos-cups-ppd-search-path.patch
  ];

-  prePatch = ''
+  postPatch = ''
+    # https://github.com/NixOS/nixpkgs/issues/44230
+    substituteInPlace createPPD.sh \
+      --replace ppdc "${cups}/bin/ppdc" \
+      --replace "gzip -c" "gzip -cn"
+
    # HPLIP hardcodes absolute paths everywhere. Nuke from orbit.
    find . -type f -exec sed -i \
      -e s,/etc/hp,$out/etc/hp,g \
@ -149,6 +154,12 @@ python3Packages.buildPythonApplication {
    export CUPS_DATADIR="${cups}/share/cups"
  '';

+  postConfigure = ''
+    # don't save timestamp, in order to improve reproducibility
+    substituteInPlace Makefile \
+      --replace "GZIP_ENV = --best" "GZIP_ENV = --best -n"
+  '';
+
  enableParallelBuilding = true;

  #
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@ -65,12 +65,12 @@ final: prev:

  ale = buildVimPluginFrom2Nix {
    pname = "ale";
-    version = "2021-07-05";
+    version = "2021-07-07";
    src = fetchFromGitHub {
      owner = "dense-analysis";
      repo = "ale";
-      rev = "958f30c1635ffc7cd47b929b382a791a9d0db37b";
-      sha256 = "1pbjqg8jn7nw3kn54mjfbm2bidwll1blay9aq70wpzcqvizn8fa0";
+      rev = "e230f07465be5b05446da30a098b4a666463503f";
+      sha256 = "0kijn7ki8r00gpb3hhxqmbs80qxlsdkwxl9x563rg4frqbz74cd2";
    };
    meta.homepage = "https://github.com/dense-analysis/ale/";
  };
@ -413,12 +413,12 @@ final: prev:

  chadtree = buildVimPluginFrom2Nix {
    pname = "chadtree";
-    version = "2021-07-06";
+    version = "2021-07-08";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "chadtree";
-      rev = "7d1bae413ad45099d7b93592e738b47f7f50b4f2";
-      sha256 = "1dyi2wxl8k875lapwgmxymhg9jyfqnilp2kiyfqs9h45dmfpmxwk";
+      rev = "b7ca56a48d52b0b3c167bbeabe35f0fbf0aa5ac6";
+      sha256 = "1c5vc1d0bhlaadrzad27z9y3k96mhfpj27mynci2g4fl73fhwdyg";
    };
    meta.homepage = "https://github.com/ms-jpq/chadtree/";
  };
@ -557,12 +557,12 @@ final: prev:

  coc-nvim = buildVimPluginFrom2Nix {
    pname = "coc-nvim";
-    version = "2021-06-29";
+    version = "2021-07-07";
    src = fetchFromGitHub {
      owner = "neoclide";
      repo = "coc.nvim";
-      rev = "34d9d52f4e030a7f1c5e15afa1928cad6d9d903d";
-      sha256 = "0mp71zwaiavn8crw64srgcg4fic69dl0rssd1y5jkwfy25r7jnfv";
+      rev = "443b5e3c026532bf2f593415d55f38237e8646e1";
+      sha256 = "0i0nci1pss419jvms7ncjzqbcg00d1hbf1c4v3cvvdssdnrh8gql";
    };
    meta.homepage = "https://github.com/neoclide/coc.nvim/";
  };
@ -666,12 +666,12 @@ final: prev:

  compe-tabnine = buildVimPluginFrom2Nix {
    pname = "compe-tabnine";
-    version = "2021-07-04";
+    version = "2021-07-07";
    src = fetchFromGitHub {
      owner = "tzachar";
      repo = "compe-tabnine";
-      rev = "b8326e2acf3056e674925a360dedc33510285f0c";
-      sha256 = "00baf8nmldvd08nsj851bdai6jywpjhg1z1hhcxn7zagj0rl6rs0";
+      rev = "a4d7b60dc538b724c4bc7df50687a879bcf764c7";
+      sha256 = "1lhy2m4awni2pmz9b7b1hkjmaaf4napgihykqwhm9rshsb0xzgvx";
    };
    meta.homepage = "https://github.com/tzachar/compe-tabnine/";
  };
@ -966,12 +966,12 @@ final: prev:

  defx-nvim = buildVimPluginFrom2Nix {
    pname = "defx-nvim";
-    version = "2021-06-23";
+    version = "2021-07-07";
    src = fetchFromGitHub {
      owner = "Shougo";
      repo = "defx.nvim";
-      rev = "b3353d8bc1f14553e18c68332dc65418977698d1";
-      sha256 = "0cydx3qv217k72rvn3gx3wb3dv5y6bf4zgggz8s84w9kn451swxn";
+      rev = "b3a0d8f5c85567ddfdefc7736336c211cb5ea899";
+      sha256 = "0dzyyfgd8dxkn94677afydjclxgb75l0skxcwnfn71hmx7dikjkw";
    };
    meta.homepage = "https://github.com/Shougo/defx.nvim/";
  };
@ -1014,12 +1014,12 @@ final: prev:

  denite-nvim = buildVimPluginFrom2Nix {
    pname = "denite-nvim";
-    version = "2021-06-27";
+    version = "2021-07-06";
    src = fetchFromGitHub {
      owner = "Shougo";
      repo = "denite.nvim";
-      rev = "54abca453ae90607a3f70cc316cba9b384bfaac1";
-      sha256 = "0hhsrw2pkp0pb8sjdr4hmqnnbnfviir56mdwl8m0vzci7zx4409x";
+      rev = "ce94c33d78005a1ebe8700a5e81f155b9ca5e797";
+      sha256 = "0272pnn3ygi3525sgsvh8s5nbrazvp42ic4v9hqdlnbdcy5ndqrz";
    };
    meta.homepage = "https://github.com/Shougo/denite.nvim/";
  };
@ -1328,12 +1328,12 @@ final: prev:

  doki-theme-vim = buildVimPluginFrom2Nix {
    pname = "doki-theme-vim";
-    version = "2021-06-16";
+    version = "2021-07-07";
    src = fetchFromGitHub {
      owner = "doki-theme";
      repo = "doki-theme-vim";
-      rev = "8a3a7b64d5509f87564d846faae5ef0b2b77d2a6";
-      sha256 = "05s7fph5bm9gz2b0biqrpsvvh8ccfxh5csxya3rkja86ppz6wawr";
+      rev = "570577ba3f47baebd9e9019916971bee60e2c2e4";
+      sha256 = "05y3dd2w518jcpgbmj83hv8knm92xnagzbv9hknhbs99bgghmp0h";
    };
    meta.homepage = "https://github.com/doki-theme/doki-theme-vim/";
  };
@ -1376,12 +1376,12 @@ final: prev:

  edge = buildVimPluginFrom2Nix {
    pname = "edge";
-    version = "2021-07-01";
+    version = "2021-07-08";
    src = fetchFromGitHub {
      owner = "sainnhe";
      repo = "edge";
-      rev = "1e540f25a4bb84fcc50b5f10c969fbda02d21027";
-      sha256 = "17qpqiv63jpap10wgfkb6zmj2xqcl7jwjglg74y9pajkpm1l050h";
+      rev = "ee266d4eda7c57ddb1db460c85e41bc52415e0ea";
+      sha256 = "03r4mvg3jysypc4xid13hcysxxbc23n1xw0vrya7i2gygiwjh37b";
    };
    meta.homepage = "https://github.com/sainnhe/edge/";
  };
@ -1643,12 +1643,12 @@ final: prev:

  friendly-snippets = buildVimPluginFrom2Nix {
    pname = "friendly-snippets";
-    version = "2021-06-27";
+    version = "2021-07-07";
    src = fetchFromGitHub {
      owner = "rafamadriz";
      repo = "friendly-snippets";
-      rev = "3361919766dde206849b901163abd7cb820e59a7";
-      sha256 = "0q25v9qlyjv58wlq6yzjajmnzi3rw8yiz9amjia6h0bzhnfxwn3l";
+      rev = "21b6ffd6d79cc16272c889e17ae7db3eb2cf8199";
+      sha256 = "088gl77k8mzwrzdyc3d0lp68fxi88npz4pvq6xyspb9cfx982x1a";
    };
    meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
  };
@ -1835,12 +1835,12 @@ final: prev:

  gitsigns-nvim = buildVimPluginFrom2Nix {
    pname = "gitsigns-nvim";
-    version = "2021-07-05";
+    version = "2021-07-07";
    src = fetchFromGitHub {
      owner = "lewis6991";
      repo = "gitsigns.nvim";
-      rev = "42c87b9ab34e0fd68fcc669137cd7b351e09a89f";
-      sha256 = "11f5hpzm0xdj2b5lfp65i5p6xbalkazpfxr4kir16v5n8q93azng";
+      rev = "9940d8bef15e2050fbe27e6cfdfdd8dc64e3593c";
+      sha256 = "09159xcyxl6hgz6wn02g582gjsf7inrpqib3wpazjldc0fcx1k4p";
    };
    meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
  };
@ -1871,12 +1871,12 @@ final: prev:

  glow-nvim = buildVimPluginFrom2Nix {
    pname = "glow-nvim";
-    version = "2021-07-01";
+    version = "2021-07-06";
    src = fetchFromGitHub {
      owner = "npxbr";
      repo = "glow.nvim";
-      rev = "c5cf6ca75af09046ea3ff51132732271a6e2dd6c";
-      sha256 = "187zm6vj8xbxs5flbqwjzzsv7vq7c6mw55phihd610bmn1wbxfnd";
+      rev = "76e834e6c44ac176202a541cb46755303bdcc88d";
+      sha256 = "0byzim4zl9hgr50qh8caq8d50xkjiplh1kp1jrpmfclzxwzzq3l3";
    };
    meta.homepage = "https://github.com/npxbr/glow.nvim/";
  };
@ -2063,12 +2063,12 @@ final: prev:

  hop-nvim = buildVimPluginFrom2Nix {
    pname = "hop-nvim";
-    version = "2021-07-01";
+    version = "2021-07-06";
    src = fetchFromGitHub {
      owner = "phaazon";
      repo = "hop.nvim";
-      rev = "0e9d4b4585f8a37d6cccbe9dd5993900b96a595b";
-      sha256 = "0gpah47azk1miybwm2aa6m3vm08683z85rgrjfywx76fnih9rs66";
+      rev = "3c46b25e2a12544e52c23377c4a0c43ab920ad65";
+      sha256 = "0sajb93635rxgv5v3bhbakbfpg958vsj8yaln7d91ab87zhbq1zj";
    };
    meta.homepage = "https://github.com/phaazon/hop.nvim/";
  };
@ -2568,12 +2568,12 @@ final: prev:

  lightspeed-nvim = buildVimPluginFrom2Nix {
    pname = "lightspeed-nvim";
-    version = "2021-07-02";
+    version = "2021-07-06";
    src = fetchFromGitHub {
      owner = "ggandor";
      repo = "lightspeed.nvim";
-      rev = "14ec41e3348d23c88235f038c7395a750e765e9d";
-      sha256 = "03chwwbwq7zgj899rl7827wqfx9ynyz0i1dhyqn1sk1mrddpr4mz";
+      rev = "1cbd25bd666f2bfbad480a5b9b308e64dbefdf71";
+      sha256 = "0xyiii94ciyki82ck2h88daazs1c17h944vv6caafijs1jqly7xi";
    };
    meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
  };
@ -2640,12 +2640,12 @@ final: prev:

  lsp_signature-nvim = buildVimPluginFrom2Nix {
    pname = "lsp_signature-nvim";
-    version = "2021-07-05";
+    version = "2021-07-06";
    src = fetchFromGitHub {
      owner = "ray-x";
      repo = "lsp_signature.nvim";
-      rev = "e2f781f8dfebf6b21929dd8b326474a828e3f08b";
-      sha256 = "15p5k2kki4pp4hg8284f8hji1b406whhpxr0dws0lx5qc4vqwhwr";
+      rev = "bb57b0fd6ce497b42b3f63443c4ee9ae980bcfcb";
+      sha256 = "0aln69gkk5b0zmlbh31rf80vc6hnv6bnk4xrmwrpsf7yi16qa1ky";
    };
    meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
  };
@ -2688,12 +2688,12 @@ final: prev:

  luasnip = buildVimPluginFrom2Nix {
    pname = "luasnip";
-    version = "2021-07-05";
+    version = "2021-07-07";
    src = fetchFromGitHub {
      owner = "l3mon4d3";
      repo = "luasnip";
-      rev = "8b9b689c247f236ad55153582342ecc788444f51";
-      sha256 = "1v24r0kqsqzd111c6ih5s2q0ckz56whqwpsq19awk3sqkvba17w3";
+      rev = "24e8972514124a493f22a27c1e2b7df45dd1e6dc";
+      sha256 = "14rr6p4xhm1ibszpm0xj20gnsxqcpqys1dwws239hwwb22y6yd8k";
    };
    meta.homepage = "https://github.com/l3mon4d3/luasnip/";
  };
@ -3156,12 +3156,12 @@ final: prev:

  neorg = buildVimPluginFrom2Nix {
    pname = "neorg";
-    version = "2021-07-03";
+    version = "2021-07-06";
    src = fetchFromGitHub {
      owner = "vhyrro";
      repo = "neorg";
-      rev = "d8aea4d54a0af773142c9be8a30944ae8e49b055";
-      sha256 = "1x2q4lhckb8ynzm9s25y877vvi691bw9sdd6764yqgdcznpdlma1";
+      rev = "67a87013ea5c976e6fe85fef6dafc46c8ef648f6";
+      sha256 = "0qdlks0cj7c8fyzk7012i4i39whgnq3n41mn3557ljf9dzd1d7b2";
    };
    meta.homepage = "https://github.com/vhyrro/neorg/";
  };
@ -3360,12 +3360,12 @@ final: prev:

  nord-nvim = buildVimPluginFrom2Nix {
    pname = "nord-nvim";
-    version = "2021-07-01";
+    version = "2021-07-06";
    src = fetchFromGitHub {
      owner = "shaunsingh";
      repo = "nord.nvim";
-      rev = "98063a91de4179685c29acb1c765a99bf08ef0f2";
-      sha256 = "18q05vfb4h94nlxylkir9chb3n62x2ibb3qlcij4rhn35fsnrfd9";
+      rev = "f576bea507648be342336f7a3f08b5e561792292";
+      sha256 = "1r5xpp186nd7wm5xncd7g7q08i3mbxzvfws43220zaywvx06yddm";
    };
    meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
  };
@ -3382,6 +3382,18 @@ final: prev:
    meta.homepage = "https://github.com/chrisbra/NrrwRgn/";
  };

+  numb-nvim = buildVimPluginFrom2Nix {
+    pname = "numb-nvim";
+    version = "2021-07-05";
+    src = fetchFromGitHub {
+      owner = "nacro90";
+      repo = "numb.nvim";
+      rev = "ec916bc8db72f576a83d47fc63e09a1c8687bb38";
+      sha256 = "0d8m9rh51ibwy1cxsagi78774lrg92iwjwinhk04i3i3smc6z7ja";
+    };
+    meta.homepage = "https://github.com/nacro90/numb.nvim/";
+  };
+
  nvcode-color-schemes-vim = buildVimPluginFrom2Nix {
    pname = "nvcode-color-schemes-vim";
    version = "2021-07-03";
@ -3492,12 +3504,12 @@ final: prev:

  nvim-compe = buildVimPluginFrom2Nix {
    pname = "nvim-compe";
-    version = "2021-07-05";
+    version = "2021-07-07";
    src = fetchFromGitHub {
      owner = "hrsh7th";
      repo = "nvim-compe";
-      rev = "00ebf180d01f7f020c6c19bd8caed59f722ccc04";
-      sha256 = "1qasn6qx4qna0p364b2kbyrd3bdw7zkzys0d2x9rgc5pn7jx80f0";
+      rev = "83b33e70f4b210ebfae86a2ec2d054ca31f467dd";
+      sha256 = "0zgyvqsmc33k9m7ckgs0s8wi365w5xlywz5xh7idlvhzw4r29y5c";
    };
    meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
  };
@ -3564,12 +3576,12 @@ final: prev:

  nvim-highlite = buildVimPluginFrom2Nix {
    pname = "nvim-highlite";
-    version = "2021-07-04";
+    version = "2021-07-06";
    src = fetchFromGitHub {
      owner = "Iron-E";
      repo = "nvim-highlite";
-      rev = "b1b6ff6b78dac7c00b70404892e0eabdacb7b223";
-      sha256 = "13icfnas86iki1x2xd2xcdh7ycp3if49zgnwpyx03djgi7ljkgjk";
+      rev = "85c931fa18cb9a7c54b0a6bde54924741bdb296c";
+      sha256 = "0fw59qgfaskwv8k8pjq1xb8b4k55rgr04311xma4arki9gjrv128";
    };
    meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
  };
@ -3624,12 +3636,12 @@ final: prev:

  nvim-lspconfig = buildVimPluginFrom2Nix {
    pname = "nvim-lspconfig";
-    version = "2021-07-05";
+    version = "2021-07-06";
    src = fetchFromGitHub {
      owner = "neovim";
      repo = "nvim-lspconfig";
-      rev = "4e8a6bb35f80e5e37c14b92b5db9abaf2dc6605f";
-      sha256 = "1zz0jf3cv7v1v3ixklld6ls4fcj05d8yy7ww20s85nqvalv5l66r";
+      rev = "e01b305a03f0b43899d31c5bdbfa2f972cf19bbf";
+      sha256 = "1s45z3pz50czyhffxcv67m7rc4jak4hvx69b9ilc37j6hb1l3l9a";
    };
    meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
  };
@ -3672,12 +3684,12 @@ final: prev:

  nvim-scrollview = buildVimPluginFrom2Nix {
    pname = "nvim-scrollview";
-    version = "2021-06-26";
+    version = "2021-07-07";
    src = fetchFromGitHub {
      owner = "dstein64";
      repo = "nvim-scrollview";
-      rev = "f0423e8085503889170b695d56191b29b51239e2";
-      sha256 = "193h67azj8pldx8csphb7vaj7sza1kv5ayzxx1xq9fynywwncjyy";
+      rev = "2216837c0178dc81cca3d47aff9699ac1b2aec8e";
+      sha256 = "0n1p7abd08k28c30pzk51vm1j3wghyjxbw0c8j0jwxiyzaf3p865";
    };
    meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
  };
@ -3708,24 +3720,24 @@ final: prev:

  nvim-tree-lua = buildVimPluginFrom2Nix {
    pname = "nvim-tree-lua";
-    version = "2021-07-02";
+    version = "2021-07-07";
    src = fetchFromGitHub {
      owner = "kyazdani42";
      repo = "nvim-tree.lua";
-      rev = "589c36e26f99486e7ab5e2e6920636ffd5f3ae2a";
-      sha256 = "0s5ha981igqkmp13xzxy1rj4cw687qxs5301byx9vjl2n5gkyb6j";
+      rev = "933d69a37fa5e7a89dc7470376fbed9e692f4253";
+      sha256 = "1ahxa1zp66vfj49lc5n7dmsw9l1xg68safn4cj2skf0ygkyqj8a9";
    };
    meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
  };

  nvim-treesitter = buildVimPluginFrom2Nix {
    pname = "nvim-treesitter";
-    version = "2021-07-05";
+    version = "2021-07-07";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter";
-      rev = "53d92f65bddf6623000b81ca5beae5ee3a6a736e";
-      sha256 = "18irdbpwqpp6xjmqk7bjlvd8k2mzyg77xgw5k4y2y5vcjg8jazfq";
+      rev = "61411b27c5e7a9539d0974583df8b6522eb89140";
+      sha256 = "1xmzapyryb7l4h0f7wfyvi4znbr032h9xw9mfqq8503c90dzb8nq";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
  };
@ -3768,24 +3780,24 @@ final: prev:

  nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
    pname = "nvim-treesitter-textobjects";
-    version = "2021-07-04";
+    version = "2021-07-07";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter-textobjects";
-      rev = "bebb977b80d7d6253e82804e05b1105a57382d12";
-      sha256 = "0ckszh3157jbzhqzyfa5gb6sixi7b66w3z3hjvl39z66dk9lf9l6";
+      rev = "321d9870d08bf7205d1088b1bee2a963727b5cc5";
+      sha256 = "1rdpxsdvlh8pf20755fz1sfkcpggfalzj6nynilk0bs943pigq9j";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
  };

  nvim-ts-rainbow = buildVimPluginFrom2Nix {
    pname = "nvim-ts-rainbow";
-    version = "2021-06-25";
+    version = "2021-07-06";
    src = fetchFromGitHub {
      owner = "p00f";
      repo = "nvim-ts-rainbow";
-      rev = "c2a5af6b6f08b883ac6925273142eb178178a2f6";
-      sha256 = "1z07c9w8ms6gpqjy1xfjhqbr1zn717i6gyn9vm7wm60rk86xrn3j";
+      rev = "72e51738bb6bf966f3f0b336739eb02cf3f8266a";
+      sha256 = "0abp18d2ha3f3hnkvs4g3wndkwb5mfi5ma7bbh7hi2yq1dav9a64";
    };
    meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
  };
@ -3924,12 +3936,12 @@ final: prev:

  packer-nvim = buildVimPluginFrom2Nix {
    pname = "packer-nvim";
-    version = "2021-07-05";
+    version = "2021-07-06";
    src = fetchFromGitHub {
      owner = "wbthomason";
      repo = "packer.nvim";
-      rev = "5f7ce98b4c81dd8d4b727adc86f83b2339befd55";
-      sha256 = "1aphdri6hb9jamwjdkjybv0r3xbdr673jd4sibzj591r2ai6kzja";
+      rev = "3fdea07bec6cb733d2f82e50a10829528b0ed4a9";
+      sha256 = "022klki8hgv1i5h91r1ag5jnk37iq6awgfijjzb47z2k525nh0nc";
    };
    meta.homepage = "https://github.com/wbthomason/packer.nvim/";
  };
@ -4273,12 +4285,12 @@ final: prev:

  registers-nvim = buildVimPluginFrom2Nix {
    pname = "registers-nvim";
-    version = "2021-07-05";
+    version = "2021-07-06";
    src = fetchFromGitHub {
      owner = "tversteeg";
      repo = "registers.nvim";
-      rev = "2208bcd4e73fd3b321ac52ce498ab679b8c959ab";
-      sha256 = "0qqskn8sg9jcpg9wvch0j8d28qjkz084hcc7hl7f1lfc70ksvc7h";
+      rev = "4e79f208b4642578edcded89f889d6c76653abbd";
+      sha256 = "041psdy4nsxhvfxx51anj58iac619p0dx9sp7710vvfwg526jifr";
    };
    meta.homepage = "https://github.com/tversteeg/registers.nvim/";
  };
@ -4369,12 +4381,12 @@ final: prev:

  rust-tools-nvim = buildVimPluginFrom2Nix {
    pname = "rust-tools-nvim";
-    version = "2021-06-15";
+    version = "2021-07-07";
    src = fetchFromGitHub {
      owner = "simrat39";
      repo = "rust-tools.nvim";
-      rev = "493202aa28b5b9e4aa378ad04de50162ec1f353c";
-      sha256 = "11azahjqg6wvahchds8hanbs8qrx2kjz7g5vcxcfyajfpns1ck6r";
+      rev = "0bf6e0986ddc5677a6ca60a59624e49234c368a5";
+      sha256 = "0anvnb1szy2w5dsvnznkdcppmcn6sd2d1419ny0bv3hb4bg07jcy";
    };
    meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
  };
@ -4598,12 +4610,12 @@ final: prev:

  sonokai = buildVimPluginFrom2Nix {
    pname = "sonokai";
-    version = "2021-07-01";
+    version = "2021-07-08";
    src = fetchFromGitHub {
      owner = "sainnhe";
      repo = "sonokai";
-      rev = "e8935bde797ce92318c60a21ee671caf04387a33";
-      sha256 = "1sw8d7ipadpa4hazs2fija3rzlf6ch7h8lkm4k3hg9m9gpviygla";
+      rev = "f9320976cee24af73d92a99eac1758c17b897d80";
+      sha256 = "1s2zxkgd4hzn5sw6fbf8ba42cvqxpz7rrwf7kidhchzjk9lgf06y";
    };
    meta.homepage = "https://github.com/sainnhe/sonokai/";
  };
@ -4634,12 +4646,12 @@ final: prev:

  Spacegray-vim = buildVimPluginFrom2Nix {
    pname = "Spacegray-vim";
-    version = "2021-06-15";
+    version = "2021-07-06";
    src = fetchFromGitHub {
      owner = "ackyshake";
      repo = "Spacegray.vim";
-      rev = "0aa4e5c973413add9766689385bf9137d8c6cbc9";
-      sha256 = "12lwvcm2ahwvr8gj1sdlgf42cd2f4xxjmiir68f09yimzajip7yi";
+      rev = "c699ca10ed421c462bd1c87a158faaa570dc8e28";
+      sha256 = "0ma8w6p5jh6llka49x5j5ql8fmhv0bx5hhsn5b2phak79yqg1k61";
    };
    meta.homepage = "https://github.com/ackyshake/Spacegray.vim/";
  };
@ -5574,12 +5586,12 @@ final: prev:

  vim-airline = buildVimPluginFrom2Nix {
    pname = "vim-airline";
-    version = "2021-06-07";
+    version = "2021-07-06";
    src = fetchFromGitHub {
      owner = "vim-airline";
      repo = "vim-airline";
-      rev = "49cdcb7b3ea76ee19c737885c0ab19e64e564169";
-      sha256 = "17p0j9i6ylns66cx6qw4266yd6al1gvmran3k4v2mhjlynf5c4s3";
+      rev = "a94d8034c3d6548575482b434a6cead8acc1cfab";
+      sha256 = "0gm3lk2inngmy7a664nhqh42likwdpj0i9p31239y1icrzi413rz";
    };
    meta.homepage = "https://github.com/vim-airline/vim-airline/";
  };
@ -5622,12 +5634,12 @@ final: prev:

  vim-android = buildVimPluginFrom2Nix {
    pname = "vim-android";
-    version = "2021-05-28";
+    version = "2021-07-07";
    src = fetchFromGitHub {
      owner = "hsanson";
      repo = "vim-android";
-      rev = "520e29d4dd2c4418e246bc28a3383fefdf501cd2";
-      sha256 = "13kdbp6542k2g2vnzvfrijyc3qmkfysn4wyrsq95bai4pqaipraf";
+      rev = "3c617dd5affe824d778ddf923a1c12c32ab5b881";
+      sha256 = "00ycm753s3jqbj73ycwdvwp8v9y26pf351a1pmz8xzfxngh7f0pn";
    };
    meta.homepage = "https://github.com/hsanson/vim-android/";
  };
@ -6558,12 +6570,12 @@ final: prev:

  vim-flake8 = buildVimPluginFrom2Nix {
    pname = "vim-flake8";
-    version = "2021-03-29";
+    version = "2021-07-06";
    src = fetchFromGitHub {
      owner = "nvie";
      repo = "vim-flake8";
-      rev = "719cc31e2d07021906cc6471b7d7b1863d2b6acf";
-      sha256 = "0514gm0r36zclhzjckxnb3v9y8hl85iddjldh0irlagfwa7by773";
+      rev = "ddceec6c457fd59bc2a9321cbf817e42aa4bfd86";
+      sha256 = "0w0g0wjikvvah6fckay2slrcl7zh9f199safhfs875g6f8halj6g";
    };
    meta.homepage = "https://github.com/nvie/vim-flake8/";
  };
@ -7689,12 +7701,12 @@ final: prev:

  vim-mundo = buildVimPluginFrom2Nix {
    pname = "vim-mundo";
-    version = "2021-03-25";
+    version = "2021-07-06";
    src = fetchFromGitHub {
      owner = "simnalamburt";
      repo = "vim-mundo";
-      rev = "c6dcea90166750bb5ed40321749966b1a8020a1a";
-      sha256 = "1bd9xab96m2j6zcp6bh7k958wj95m8w40hczmn2qzpq3cvpy8nb0";
+      rev = "2a12e25c4236a46d09e4d038560f0412bbdb117f";
+      sha256 = "0spq5gw61mxdhrqa1lcj7b9f52cqw7g0aiizjqnskl9915xsjmp2";
    };
    meta.homepage = "https://github.com/simnalamburt/vim-mundo/";
  };
@ -7977,12 +7989,12 @@ final: prev:

  vim-pandoc-syntax = buildVimPluginFrom2Nix {
    pname = "vim-pandoc-syntax";
-    version = "2021-03-10";
+    version = "2021-07-06";
    src = fetchFromGitHub {
      owner = "vim-pandoc";
      repo = "vim-pandoc-syntax";
-      rev = "aba6b5596cf0e879a83a2aa5edc93e5e5753bea8";
-      sha256 = "0hgzmfcyl3qhdmyyxdaynlm7psk164v8xg5j1kvdaxxgj4lwbnig";
+      rev = "5056e635ecf406e65d7d28651bab55600dd18741";
+      sha256 = "0mzvknzk42x5h2p3l9gmmxhbardfkrirr8wzfx460cm5daps6j2q";
    };
    meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/";
  };
@ -8361,12 +8373,12 @@ final: prev:

  vim-ruby = buildVimPluginFrom2Nix {
    pname = "vim-ruby";
-    version = "2021-06-12";
+    version = "2021-07-07";
    src = fetchFromGitHub {
      owner = "vim-ruby";
      repo = "vim-ruby";
-      rev = "a006f67d18ce0ed6ff75c98b266eaa606dfcec30";
-      sha256 = "0dhkyfignmcv9jwrszk37k7l8h2ivbv3krz5xwk17fbdd2y7jwz2";
+      rev = "0f603a17435f6b25614e70449304d38216d0e6e3";
+      sha256 = "0dz4rmbifz5l03ch5rrnzb18j7kdwz1nkfz0lcvkwgxgjnrrhk15";
    };
    meta.homepage = "https://github.com/vim-ruby/vim-ruby/";
  };
@ -8613,12 +8625,12 @@ final: prev:

  vim-sneak = buildVimPluginFrom2Nix {
    pname = "vim-sneak";
-    version = "2021-07-03";
+    version = "2021-07-08";
    src = fetchFromGitHub {
      owner = "justinmk";
      repo = "vim-sneak";
-      rev = "51c21ee1ffeea132104da619c9643e61e337e427";
-      sha256 = "1da9b5c15sm8cacfwkggg7kl61vxk94qsamanaaz776xlsj0b9z0";
+      rev = "b999e0a21c4618b635f0a795ab4b59d8648aeb31";
+      sha256 = "0wddf9jd1zwajwhh87jvvlvk52ng0f37ffrq4ahf458si7r8ywpf";
    };
    meta.homepage = "https://github.com/justinmk/vim-sneak/";
  };
@ -8721,12 +8733,12 @@ final: prev:

  vim-startuptime = buildVimPluginFrom2Nix {
    pname = "vim-startuptime";
-    version = "2021-07-04";
+    version = "2021-07-07";
    src = fetchFromGitHub {
      owner = "dstein64";
      repo = "vim-startuptime";
-      rev = "d4cc839f4a7c8fc0b7fbf8ec6a11ef1c1be846e1";
-      sha256 = "05yz4cpxx7n6ggkm8n9s0q387syllbn8s8vn4fwchnml4jdqigfq";
+      rev = "3d0d1617cf1bfef35c647531aa6d14e057fd5cc1";
+      sha256 = "07y060046y6mph1i2qnhrfz8hw3j7i85sp3xq3cwxxssb19rh1g9";
    };
    meta.homepage = "https://github.com/dstein64/vim-startuptime/";
  };
@ -9539,12 +9551,12 @@ final: prev:

  vimtex = buildVimPluginFrom2Nix {
    pname = "vimtex";
-    version = "2021-07-05";
+    version = "2021-07-07";
    src = fetchFromGitHub {
      owner = "lervag";
      repo = "vimtex";
-      rev = "3807da1c530e46fb6a633a2268f6e435b16b657b";
-      sha256 = "0l05fkisvcq9p9jwbxpbb9svwi0h4gp84d7dc4zlkrin1jwnnxyd";
+      rev = "ab62800ea987bcbf3bb53ace9280148a132594cf";
+      sha256 = "1rcyhiss26zfkfzs8cb44z7d60098qjvvp1silyb5435agx58h1k";
    };
    meta.homepage = "https://github.com/lervag/vimtex/";
  };
@ -9635,12 +9647,12 @@ final: prev:

  which-key-nvim = buildVimPluginFrom2Nix {
    pname = "which-key-nvim";
-    version = "2021-07-05";
+    version = "2021-07-06";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "which-key.nvim";
-      rev = "2d2954a1d05b4f074e022e64db9aa6093d439bb0";
-      sha256 = "0xpf889ijhrbnpjcky575k46nfh69m5dzcfnvw29vwhdikaz33ma";
+      rev = "dc9c3be7acae2a486c117f5a9f6ada62b2243336";
+      sha256 = "105fnr3qa64izllb9s4r6lsg5mfddiap784j7zz7gh3znpy43n3m";
    };
    meta.homepage = "https://github.com/folke/which-key.nvim/";
  };
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@ -395,6 +395,10 @@ self: super: {
    dependencies = with self; [ ultisnips ];
  });

+  neogit = super.neogit.overrideAttrs (old: {
+    dependencies = with self; [ plenary-nvim ];
+  });
+
  nvim-lsputils = super.nvim-lsputils.overrideAttrs (old: {
    dependencies = with self; [ popfix ];
  });
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@ -419,6 +419,7 @@ ms-jpq/chadtree@chad
 mtikekar/vim-bsv
 mzlogin/vim-markdown-toc
 mzlogin/vim-smali
+nacro90/numb.nvim
 nanotech/jellybeans.vim
 natebosch/vim-lsc
 nathanaelkane/vim-indent-guides
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@ -844,6 +844,7 @@ let
      PREEMPT_VOLUNTARY = yes;

      X86_AMD_PLATFORM_DEVICE = yes;
+      X86_PLATFORM_DRIVERS_DELL = whenAtLeast "5.12" yes;

    } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
      # Enable CPU/memory hotplug support
--- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix
+++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix
@ -1,8 +1,8 @@
 { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:

 let
-  version = "5.13.0";
-  suffix = "xanmod2-cacule";
+  version = "5.13.1";
+  suffix = "xanmod1-cacule";
 in
 buildLinux (args // rec {
  inherit version;
@ -12,7 +12,7 @@ buildLinux (args // rec {
    owner = "xanmod";
    repo = "linux";
    rev = modDirVersion;
-    sha256 = "sha256-q+m1Ys/Gfr56cihoX8LS/w7icNcM3oefcXRtvzgx3cM=";
+    sha256 = "sha256-QC2BgsbytpKQs7TyuXt4aan8hUwd43pHj2ApYXv0HAA=";
  };

  structuredExtraConfig = with lib.kernel; {
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@ -8,7 +8,7 @@

 stdenv.mkDerivation rec {
  pname = "timescaledb";
-  version = "2.3.0";
+  version = "2.3.1";

  nativeBuildInputs = [ cmake ];
  buildInputs = [ postgresql openssl libkrb5 ];
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
    owner  = "timescale";
    repo   = "timescaledb";
    rev    = "refs/tags/${version}";
-    sha256 = "03k6skl3191i5jby710xr1caq85cvzbjqmqv59mfkfbvihn2zfx2";
+    sha256 = "0azcg8fh0bbc4a6b0mghdg4b9v62bb3haaq6cycj40fk4mf1dldx";
  };

  cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ]
--- a/Show More
+++ b/Show More