Merge master into staging-next

2021-10-27 00:01:25 +00:00 · 2021-10-27 00:01:25 +00:00 · 23c6bab47e
commit 23c6bab47e
parent 9a27efeb34 113fcf34ab
56 changed files with 3921 additions and 1505 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -6053,6 +6053,12 @@
    githubId = 8260207;
    name = "Karthik Iyengar";
  };
+  kjeremy = {
+    email = "kjeremy@gmail.com";
+    name = "Jeremy Kolb";
+    github = "kjeremy";
+    githubId = 4325700;
+  };
  kkallio = {
    email = "tierpluspluslists@gmail.com";
    name = "Karn Kallio";
--- a/nixos/modules/services/backup/restic.nix
+++ b/nixos/modules/services/backup/restic.nix
@ -11,7 +11,7 @@ in
    description = ''
      Periodic backups to create with Restic.
    '';
-    type = types.attrsOf (types.submodule ({ name, ... }: {
+    type = types.attrsOf (types.submodule ({ config, name, ... }: {
      options = {
        passwordFile = mkOption {
          type = types.str;
@ -21,6 +21,17 @@ in
          example = "/etc/nixos/restic-password";
        };

+        environmentFile = mkOption {
+          type = with types; nullOr str;
+          # added on 2021-08-28, s3CredentialsFile should
+          # be removed in the future (+ remember the warning)
+          default = config.s3CredentialsFile;
+          description = ''
+            file containing the credentials to access the repository, in the
+            format of an EnvironmentFile as described by systemd.exec(5)
+          '';
+        };
+
        s3CredentialsFile = mkOption {
          type = with types; nullOr str;
          default = null;
@ -212,6 +223,7 @@ in
  };

  config = {
+    warnings = mapAttrsToList (n: v: "services.restic.backups.${n}.s3CredentialsFile is deprecated, please use services.restic.backups.${n}.environmentFile instead.") (filterAttrs (n: v: v.s3CredentialsFile != null) config.services.restic.backups);
    systemd.services =
      mapAttrs' (name: backup:
        let
@ -251,8 +263,8 @@ in
            RuntimeDirectory = "restic-backups-${name}";
            CacheDirectory = "restic-backups-${name}";
            CacheDirectoryMode = "0700";
-          } // optionalAttrs (backup.s3CredentialsFile != null) {
-            EnvironmentFile = backup.s3CredentialsFile;
+          } // optionalAttrs (backup.environmentFile != null) {
+            EnvironmentFile = backup.environmentFile;
          };
        } // optionalAttrs (backup.initialize || backup.dynamicFilesFrom != null) {
          preStart = ''
--- a/nixos/modules/services/security/step-ca.nix
+++ b/nixos/modules/services/security/step-ca.nix
@ -119,7 +119,7 @@ in
          ];

          # ProtectProc = "invisible"; # not supported by upstream yet
-          # ProcSubset = "pid"; # not supported by upstream upstream yet
+          # ProcSubset = "pid"; # not supported by upstream yet
          # PrivateUsers = true; # doesn't work with privileged ports therefore not supported by upstream

          DynamicUser = true;
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
@ -384,10 +384,10 @@
      elpaBuild {
        pname = "boxy-headings";
        ename = "boxy-headings";
-        version = "2.1.0";
+        version = "2.1.2";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/boxy-headings-2.1.0.tar";
-          sha256 = "021w4ic028jsq7vxz1jgnfny9dymcz6v112b3b3nwyw3g3dnc62f";
+          url = "https://elpa.gnu.org/packages/boxy-headings-2.1.2.tar";
+          sha256 = "0jyfp41jw33kmi7832x5x0mgh5niqvb7dfc7q00kay5q9ixg83dq";
        };
        packageRequires = [ boxy emacs org ];
        meta = {
@ -707,6 +707,21 @@
          license = lib.licenses.free;
        };
      }) {};
+    coterm = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "coterm";
+        ename = "coterm";
+        version = "1.2";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/coterm-1.2.tar";
+          sha256 = "0jl48bi4a4fkk7p2nj2bx0b658wrjw0cvab5ds6rid44irc8b1mn";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/coterm.html";
+          license = lib.licenses.free;
+        };
+      }) {};
    counsel = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib, swiper }:
      elpaBuild {
        pname = "counsel";
@ -1146,10 +1161,10 @@
      elpaBuild {
        pname = "eev";
        ename = "eev";
-        version = "20211011";
+        version = "20211024";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/eev-20211011.tar";
-          sha256 = "1a71qam6z5s3zl7fvxpsnabbqxh8a7llm1524nxs2353pb6ksfra";
+          url = "https://elpa.gnu.org/packages/eev-20211024.tar";
+          sha256 = "165mscb1kpgd3db92vklglnaph60rvrr8wm3hpkhrbyac100ryji";
        };
        packageRequires = [ emacs ];
        meta = {
@ -1484,10 +1499,10 @@
      elpaBuild {
        pname = "flymake-proselint";
        ename = "flymake-proselint";
-        version = "0.2.1";
+        version = "0.2.2";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/flymake-proselint-0.2.1.tar";
-          sha256 = "08hbz8k3idr1gb98q3ssmzsdya5afjxl25l9xzqp9q2w5krc8433";
+          url = "https://elpa.gnu.org/packages/flymake-proselint-0.2.2.tar";
+          sha256 = "0v43d2cszrq8lzshm17x6aiqbkzwz5kj8x5sznc3nip9gaqsrfv1";
        };
        packageRequires = [ emacs ];
        meta = {
@ -3591,10 +3606,10 @@
      elpaBuild {
        pname = "shell-command-plus";
        ename = "shell-command+";
-        version = "2.3.1";
+        version = "2.3.2";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/shell-command+-2.3.1.tar";
-          sha256 = "0g8pcrkkh3bxcxxbasnz834gi3pvhlkpf011fvmlhwzswypcyqmy";
+          url = "https://elpa.gnu.org/packages/shell-command+-2.3.2.tar";
+          sha256 = "03hmk4gr9kjy3238n0ys9na00py035j9s0y8d87c45f5af6c6g2c";
        };
        packageRequires = [ emacs ];
        meta = {
@ -3632,6 +3647,21 @@
          license = lib.licenses.free;
        };
      }) {};
+    sketch-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "sketch-mode";
+        ename = "sketch-mode";
+        version = "1.0.3";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/sketch-mode-1.0.3.tar";
+          sha256 = "17xa8754zp07izgd3b9hywlwd1jrbzyc5y1rrhin7w6r0pyvqs51";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/sketch-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
    slime-volleyball = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
      elpaBuild {
        pname = "slime-volleyball";
@ -4219,10 +4249,10 @@
      elpaBuild {
        pname = "vc-hgcmd";
        ename = "vc-hgcmd";
-        version = "1.14";
+        version = "1.14.1";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/vc-hgcmd-1.14.tar";
-          sha256 = "0pg6fg0znsmky3iwdpxn2sx5bbn72kw83s077000ilawi6zqwc2d";
+          url = "https://elpa.gnu.org/packages/vc-hgcmd-1.14.1.tar";
+          sha256 = "12izw5ln22xdgwh6mqm6axzdfpcnqq7qcj72nmykrbsgpagp5fy6";
        };
        packageRequires = [ emacs ];
        meta = {
@ -4281,10 +4311,10 @@
      elpaBuild {
        pname = "verilog-mode";
        ename = "verilog-mode";
-        version = "2021.9.23.89128420";
+        version = "2021.10.14.127365406";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/verilog-mode-2021.9.23.89128420.tar";
-          sha256 = "1sgmkmif44npghz4nnag1w91qrrylq36175cjj87lcdp22s6isgk";
+          url = "https://elpa.gnu.org/packages/verilog-mode-2021.10.14.127365406.tar";
+          sha256 = "0d842dwg98srv73nkg69c7x24rw20mxgqmb4k1qcbl02bwxkfmsm";
        };
        packageRequires = [];
        meta = {
@ -4604,10 +4634,10 @@
      elpaBuild {
        pname = "xref";
        ename = "xref";
-        version = "1.3.0";
+        version = "1.3.2";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xref-1.3.0.tar";
-          sha256 = "0bw2cbxmjavzhmpd9gyl41d4c201p535jrfz3b7jb5zw12jdnppl";
+          url = "https://elpa.gnu.org/packages/xref-1.3.2.tar";
+          sha256 = "13bsaxdxwn14plaam0hsrswngh3rm2k29v5ybjgjyjy4d5vwz78j";
        };
        packageRequires = [ emacs ];
        meta = {
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
@ -1,5 +1,65 @@
 { callPackage }:
  {
+    afternoon-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "afternoon-theme";
+        ename = "afternoon-theme";
+        version = "0.1";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/afternoon-theme-0.1.tar";
+          sha256 = "0aalwn1hf0p756qmiybmxphh4dx8gd5r4jhbl43l6y68fdijr6qg";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/afternoon-theme.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    alect-themes = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "alect-themes";
+        ename = "alect-themes";
+        version = "0.10";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/alect-themes-0.10.tar";
+          sha256 = "0j5zwmxq1f9hlarr1f0j010kd3n2k8hbhr8pw789j3zlc2kmx5bb";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/alect-themes.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ample-theme = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "ample-theme";
+        ename = "ample-theme";
+        version = "0.3.0";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/ample-theme-0.3.0.tar";
+          sha256 = "0b5a9pqvmfc3h1l0rsmw57vj5j740ysnlpiig6jx9rkgn7awm5p1";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ample-theme.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anti-zenburn-theme = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "anti-zenburn-theme";
+        ename = "anti-zenburn-theme";
+        version = "2.5.1";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/anti-zenburn-theme-2.5.1.tar";
+          sha256 = "06d7nm4l6llv7wjbwnhfaamrcihichljkpwnllny960pi56a8gmr";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/anti-zenburn-theme.html";
+          license = lib.licenses.free;
+        };
+      }) {};
    apache-mode = callPackage ({ elpaBuild, fetchurl, lib }:
      elpaBuild {
        pname = "apache-mode";
@ -15,6 +75,21 @@
          license = lib.licenses.free;
        };
      }) {};
+    apropospriate-theme = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "apropospriate-theme";
+        ename = "apropospriate-theme";
+        version = "0.1.1";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/apropospriate-theme-0.1.1.tar";
+          sha256 = "11m80gijxvg4jf9davjja3bvykv161ggsrg7q0bihr0gq0flxgd7";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/apropospriate-theme.html";
+          license = lib.licenses.free;
+        };
+      }) {};
    arduino-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, spinner }:
      elpaBuild {
        pname = "arduino-mode";
@ -75,6 +150,24 @@
          license = lib.licenses.free;
        };
      }) {};
+    color-theme-tangotango = callPackage ({ color-theme
+                                          , elpaBuild
+                                          , fetchurl
+                                          , lib }:
+      elpaBuild {
+        pname = "color-theme-tangotango";
+        ename = "color-theme-tangotango";
+        version = "0.0.6";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/color-theme-tangotango-0.0.6.tar";
+          sha256 = "0lfr3xg9xvfjb12kcw80d35a1ayn4f5w1dkd2b0kx0wxkq0bykim";
+        };
+        packageRequires = [ color-theme ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/color-theme-tangotango.html";
+          license = lib.licenses.free;
+        };
+      }) {};
    crux = callPackage ({ elpaBuild, fetchurl, lib, seq }:
      elpaBuild {
        pname = "crux";
@ -90,6 +183,21 @@
          license = lib.licenses.free;
        };
      }) {};
+    cyberpunk-theme = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "cyberpunk-theme";
+        ename = "cyberpunk-theme";
+        version = "1.22";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/cyberpunk-theme-1.22.tar";
+          sha256 = "1kva129l8vwfvafw329znrsqhm1j645xsyz55il1jhc28fbijp51";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/cyberpunk-theme.html";
+          license = lib.licenses.free;
+        };
+      }) {};
    d-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
      elpaBuild {
        pname = "d-mode";
@ -120,6 +228,21 @@
          license = lib.licenses.free;
        };
      }) {};
+    dracula-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "dracula-theme";
+        ename = "dracula-theme";
+        version = "1.7.0";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/dracula-theme-1.7.0.tar";
+          sha256 = "0vbi9560phdp38x5mfl1f9rp8cw7p7s2mvbww84ka0gfz0zrczpm";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/dracula-theme.html";
+          license = lib.licenses.free;
+        };
+      }) {};
    editorconfig = callPackage ({ cl-lib ? null
                                , elpaBuild
                                , emacs
@ -159,10 +282,10 @@
      elpaBuild {
        pname = "flymake-kondor";
        ename = "flymake-kondor";
-        version = "0.1.0";
+        version = "0.1.2";
        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/flymake-kondor-0.1.0.tar";
-          sha256 = "0fn9vnrqy5nmv07jv2ry0xs90rkb92qhrh7j5pdikw7zykcwlbdd";
+          url = "https://elpa.nongnu.org/nongnu/flymake-kondor-0.1.2.tar";
+          sha256 = "17mmn9mj4zl5f7byairkgxz6s2mrq73q3219s73c0b2g0g846krn";
        };
        packageRequires = [ emacs ];
        meta = {
@ -356,6 +479,21 @@
          license = lib.licenses.free;
        };
      }) {};
+    git-modes = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "git-modes";
+        ename = "git-modes";
+        version = "1.4.0";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.0.tar";
+          sha256 = "1pag50l0rl361p1617rdvhhdajsmq9b1lyi94g16hibygdn7vaff";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/git-modes.html";
+          license = lib.licenses.free;
+        };
+      }) {};
    gnuplot = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
      elpaBuild {
        pname = "gnuplot";
@ -416,6 +554,21 @@
          license = lib.licenses.free;
        };
      }) {};
+    haml-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "haml-mode";
+        ename = "haml-mode";
+        version = "3.1.10";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/haml-mode-3.1.10.tar";
+          sha256 = "1qkhm52xr8vh9zp728ass5kxjw7fj65j84m06db084qpavnwvysa";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/haml-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
    haskell-mode = callPackage ({ elpaBuild, fetchurl, lib }:
      elpaBuild {
        pname = "haskell-mode";
@ -638,6 +791,36 @@
          license = lib.licenses.free;
        };
      }) {};
+    material-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "material-theme";
+        ename = "material-theme";
+        version = "2015";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/material-theme-2015.tar";
+          sha256 = "027plf401y3lb5y9hzj8gpy9sm0p1k8hv94pywnagq4kr9hivnb9";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/material-theme.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    monokai-theme = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "monokai-theme";
+        ename = "monokai-theme";
+        version = "3.5.3";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/monokai-theme-3.5.3.tar";
+          sha256 = "15b5ijkb0wrixlw13rj02x7m0r3ldqfs3bb6g48hhbqfapd6rcx0";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/monokai-theme.html";
+          license = lib.licenses.free;
+        };
+      }) {};
    multiple-cursors = callPackage ({ elpaBuild, fetchurl, lib }:
      elpaBuild {
        pname = "multiple-cursors";
@ -792,10 +975,10 @@
      elpaBuild {
        pname = "rust-mode";
        ename = "rust-mode";
-        version = "0.5.0";
+        version = "1.0.0";
        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/rust-mode-0.5.0.tar";
-          sha256 = "03z1nsq1s3awaczirlxixq4gwhz9bf1x5zwd5xfb88ay4kzcmjwc";
+          url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.0.tar";
+          sha256 = "0ch3hf954iy5hh5zyjjg68szdk5icppmi8nbap27wfwgvhvyfa67";
        };
        packageRequires = [ emacs ];
        meta = {
@ -882,6 +1065,36 @@
          license = lib.licenses.free;
        };
      }) {};
+    solarized-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "solarized-theme";
+        ename = "solarized-theme";
+        version = "1.3.0";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/solarized-theme-1.3.0.tar";
+          sha256 = "0wa3wp9r0h4y3kkiw8s4pi1zvg22yhnpsp8ckv1hp4y6js5jbg65";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/solarized-theme.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    subatomic-theme = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "subatomic-theme";
+        ename = "subatomic-theme";
+        version = "1.8.1";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/subatomic-theme-1.8.1.tar";
+          sha256 = "0j496l7c2rwgxk2srcf1a70z63y48q5bs9cpx95212q7rl20zhip";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/subatomic-theme.html";
+          license = lib.licenses.free;
+        };
+      }) {};
    swift-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }:
      elpaBuild {
        pname = "swift-mode";
@ -927,6 +1140,21 @@
          license = lib.licenses.free;
        };
      }) {};
+    ujelly-theme = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "ujelly-theme";
+        ename = "ujelly-theme";
+        version = "1.2.9";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/ujelly-theme-1.2.9.tar";
+          sha256 = "04h86s0a44cmxizqi4p5h9gl1aiqwrvkh3xmawvn7z836i3hvxn9";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ujelly-theme.html";
+          license = lib.licenses.free;
+        };
+      }) {};
    vc-fossil = callPackage ({ elpaBuild, fetchurl, lib }:
      elpaBuild {
        pname = "vc-fossil";
@ -1017,6 +1245,21 @@
          license = lib.licenses.free;
        };
      }) {};
+    zenburn-theme = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "zenburn-theme";
+        ename = "zenburn-theme";
+        version = "2.7.0";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/zenburn-theme-2.7.0.tar";
+          sha256 = "1x7gd5w0g47kcam88lm605b35y35iq3q5f991a84l050c8syrkpy";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/zenburn-theme.html";
+          license = lib.licenses.free;
+        };
+      }) {};
    zig-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
      elpaBuild {
        pname = "zig-mode";
--- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
--- a/pkgs/applications/misc/mdzk/default.nix
+++ b/pkgs/applications/misc/mdzk/default.nix
@ -0,0 +1,25 @@
+{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "mdzk";
+  version = "0.4.2";
+
+  src = fetchFromGitHub {
+    owner = "mdzk-rs";
+    repo = "mdzk";
+    rev = version;
+    sha256 = "sha256-yz8lLFAP2/16fixknqGziyrUJKs3Qo1+whV82kUPuAE=";
+  };
+
+  cargoSha256 = "sha256-TGNzi8fMU7RhX2SJyxpYfJLgGYxpO/XkmDXzMdlX/2o=";
+
+  buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
+
+  meta = with lib; {
+    description = "Plain text Zettelkasten based on mdBook";
+    homepage = "https://github.com/mdzk-rs/mdzk/";
+    changelog = "https://github.com/mdzk-rs/mdzk/blob/main/CHANGELOG.md";
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ bryanasdev000 ratsclub ];
+  };
+}
--- a/pkgs/applications/science/misc/snakemake/default.nix
+++ b/pkgs/applications/science/misc/snakemake/default.nix
@ -2,7 +2,7 @@

 python3Packages.buildPythonApplication rec {
  pname = "snakemake";
-  version = "6.7.0";
+  version = "6.10.0";

  propagatedBuildInputs = with python3Packages; [
    appdirs
@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec {

  src = python3Packages.fetchPypi {
    inherit pname version;
-    sha256 = "6f53d54044c5d1718c7858f45286beeffb220c794fe5f602a5c20bf0caf8ec07";
+    sha256 = "199a86c8d1fcfdb88c4271a1507b0ab371a15bc407f2dad9b0ab8c43438adff8";
  };

  doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json
--- a/pkgs/development/libraries/physics/pythia/default.nix
+++ b/pkgs/development/libraries/physics/pythia/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "pythia";
-  version = "8.305";
+  version = "8.306";

  src = fetchurl {
-    url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz";
-    sha256 = "03rpy2bmx67217fh1spfn36x9xrk0igcj56byki77lgj0y5mz21a";
+    url = "https://pythia.org/download/pythia83/pythia${builtins.replaceStrings ["."] [""] version}.tgz";
+    sha256 = "sha256-c0gDtyKxwbU8jPLw08MHR8gPwt3l4LoUG8k5fa03qPY=";
  };

  nativeBuildInputs = [ rsync ];
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "A program for the generation of high-energy physics events";
    license = licenses.gpl2Only;
-    homepage = "http://home.thep.lu.se/~torbjorn/Pythia.html";
+    homepage = "https://pythia.org";
    platforms = platforms.unix;
    maintainers = with maintainers; [ veprbl ];
  };
--- a/pkgs/development/ocaml-modules/coin/default.nix
+++ b/pkgs/development/ocaml-modules/coin/default.nix
@ -0,0 +1,38 @@
+{ buildDunePackage
+, fetchzip
+, findlib
+, lib
+, menhir
+, ocaml
+, re
+}:
+
+buildDunePackage rec {
+  pname = "coin";
+  version = "0.1.3";
+  minimalOCamlVersion = "4.03";
+
+  src = fetchzip {
+    url = "https://github.com/mirage/coin/releases/download/v${version}/coin-v${version}.tbz";
+    sha256 = "06bfidvglyp9hzvr2xwbdx8wf26is2xrzc31fldzjf5ab0vd076p";
+  };
+
+  postPatch = ''
+    substituteInPlace src/dune --replace 'ocaml} ' \
+      'ocaml} -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib '
+  '';
+
+  useDune2 = true;
+
+  nativeBuildInputs = [ menhir ];
+
+  checkInputs = [ re ];
+  doCheck = true;
+
+  meta = {
+    description = "A library to normalize an KOI8-{U,R} input to Unicode";
+    license = lib.licenses.mit;
+    homepage = "https://github.com/mirage/coin";
+    maintainers = with lib.maintainers; [ superherointj ];
+  };
+}
--- a/pkgs/development/ocaml-modules/mrmime/default.nix
+++ b/pkgs/development/ocaml-modules/mrmime/default.nix
@ -0,0 +1,77 @@
+{ afl-persistent
+, alcotest
+, angstrom
+, base64
+, bigarray-compat
+, bigarray-overlap
+, bigstringaf
+, buildDunePackage
+, emile
+, fetchzip
+, fmt
+, fpath
+, hxd
+, ipaddr
+, jsonm
+, ke
+, lib
+, mirage-crypto-rng
+, pecu
+, prettym
+, ptime
+, rosetta
+, rresult
+, unstrctrd
+, uutf
+}:
+
+buildDunePackage rec {
+  pname = "mrmime";
+  version = "0.5.0";
+
+  src = fetchzip {
+    url = "https://github.com/mirage/mrmime/releases/download/v${version}/mrmime-v${version}.tbz";
+    sha256 = "14k67v0b39b8jq3ny2ymi8g8sqx2gd81mlzsjphdzdqnlx6fk716";
+  };
+
+  useDune2 = true;
+
+  buildInputs = [
+    afl-persistent
+    bigarray-compat
+    bigarray-overlap
+    bigstringaf
+    fpath
+    mirage-crypto-rng
+  ];
+
+  propagatedBuildInputs = [
+    angstrom
+    base64
+    emile
+    fmt
+    ipaddr
+    ke
+    pecu
+    prettym
+    ptime
+    rosetta
+    rresult
+    unstrctrd
+    uutf
+  ];
+
+  checkInputs = [
+    alcotest
+    hxd
+    jsonm
+  ];
+  doCheck = true;
+
+  meta = {
+    description = "Parser and generator of mail in OCaml";
+    license = lib.licenses.mit;
+    homepage = "https://github.com/mirage/mrmime";
+    maintainers = with lib.maintainers; [ superherointj ];
+  };
+}
--- a/pkgs/development/ocaml-modules/prettym/default.nix
+++ b/pkgs/development/ocaml-modules/prettym/default.nix
@ -0,0 +1,48 @@
+{ alcotest
+, base64
+, bigarray-compat
+, bigarray-overlap
+, bigstringaf
+, buildDunePackage
+, fetchzip
+, fmt
+, jsonm
+, ke
+, lib
+, ptime
+}:
+
+buildDunePackage rec {
+  pname = "prettym";
+  version = "0.0.2";
+
+  src = fetchzip {
+    url = "https://github.com/dinosaure/prettym/releases/download/${version}/prettym-${version}.tbz";
+    sha256 = "03x7jh62mvzc6x2d8xsy456qa6iphw72zm7jmqrakpmsy6zcf2lb";
+  };
+
+  useDune2 = true;
+
+  propagatedBuildInputs = [
+    bigarray-compat
+    bigarray-overlap
+    bigstringaf
+    fmt
+    ke
+  ];
+
+  checkInputs = [
+    ptime
+    alcotest
+    jsonm
+    base64
+  ];
+  doCheck = true;
+
+  meta = {
+    description = "A simple bounded encoder to serialize human readable values and respect the 80-column constraint";
+    license = lib.licenses.mit;
+    homepage = "https://github.com/dinosaure/prettym";
+    maintainers = with lib.maintainers; [ superherointj ];
+  };
+}
--- a/pkgs/development/ocaml-modules/rosetta/default.nix
+++ b/pkgs/development/ocaml-modules/rosetta/default.nix
@ -0,0 +1,34 @@
+{ buildDunePackage
+, coin
+, fetchzip
+, lib
+, yuscii
+, uuuu
+}:
+
+buildDunePackage rec {
+  pname = "rosetta";
+  version = "0.3.0";
+
+  src = fetchzip {
+    url = "https://github.com/mirage/rosetta/releases/download/v${version}/rosetta-v${version}.tbz";
+    sha256 = "1gzp3fbk8qd207cm25dgj9kj7b44ldqpjs63pl6xqvi9hx60m3ij";
+  };
+
+  useDune2 = true;
+
+  propagatedBuildInputs = [
+    coin
+    uuuu
+    yuscii
+  ];
+
+  doCheck = false; # No tests.
+
+  meta = {
+    description = "Universal decoder of an encoded flow (UTF-7, ISO-8859 and KOI8) to Unicode";
+    license = lib.licenses.mit;
+    homepage = "https://github.com/mirage/rosetta";
+    maintainers = with lib.maintainers; [ superherointj ];
+  };
+}
--- a/pkgs/development/ocaml-modules/unstrctrd/default.nix
+++ b/pkgs/development/ocaml-modules/unstrctrd/default.nix
@ -0,0 +1,48 @@
+{ alcotest
+, angstrom
+, bigstringaf
+, buildDunePackage
+, crowbar
+, fetchzip
+, fmt
+, hxd
+, ke
+, lib
+, rresult
+, uutf
+}:
+
+buildDunePackage rec {
+  pname = "unstrctrd";
+  version = "0.3";
+
+  src = fetchzip {
+    url = "https://github.com/dinosaure/unstrctrd/releases/download/v${version}/unstrctrd-v${version}.tbz";
+    sha256 = "0mjm4v7kk75iwwsfnpmxc3bsl8aisz53y7z21sykdp60f4rxnah7";
+  };
+
+  useDune2 = true;
+
+  propagatedBuildInputs = [
+    angstrom
+    uutf
+  ];
+
+  checkInputs = [
+    alcotest
+    bigstringaf
+    crowbar
+    fmt
+    hxd
+    ke
+    rresult
+  ];
+  doCheck = true;
+
+  meta = {
+    description = "A library for parsing email headers";
+    homepage = "https://github.com/dinosaure/unstrctrd";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ superherointj ];
+  };
+}
--- a/pkgs/development/ocaml-modules/uuuu/default.nix
+++ b/pkgs/development/ocaml-modules/uuuu/default.nix
@ -0,0 +1,40 @@
+{ angstrom
+, buildDunePackage
+, fetchzip
+, findlib
+, lib
+, menhir
+, ocaml
+, re
+}:
+
+buildDunePackage rec {
+  pname = "uuuu";
+  version = "0.2.0";
+
+  src = fetchzip {
+    url = "https://github.com/mirage/uuuu/releases/download/v${version}/uuuu-v${version}.tbz";
+    sha256 = "0457qcxvakbbc56frsh8a5v4y4l0raj9p4zz7jx3brn9255j1mw3";
+  };
+
+  postPatch = ''
+    substituteInPlace src/dune --replace 'ocaml} ' \
+      'ocaml} -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib '
+  '';
+
+  useDune2 = true;
+
+  nativeBuildInputs = [ menhir ];
+
+  buildInputs = [ angstrom ];
+
+  checkInputs = [ re ];
+  doCheck = true;
+
+  meta = {
+    description = "A library to normalize an ISO-8859 input to Unicode code-point";
+    license = lib.licenses.mit;
+    homepage = "https://github.com/mirage/uuuu";
+    maintainers = with lib.maintainers; [ superherointj ];
+  };
+}
--- a/pkgs/development/ocaml-modules/yuscii/default.nix
+++ b/pkgs/development/ocaml-modules/yuscii/default.nix
@ -0,0 +1,33 @@
+{ alcotest
+, buildDunePackage
+, fetchzip
+, fmt
+, lib
+, uutf
+}:
+
+buildDunePackage rec {
+  pname = "yuscii";
+  version = "0.3.0";
+
+  src = fetchzip {
+    url = "https://github.com/mirage/yuscii/releases/download/v${version}/yuscii-v${version}.tbz";
+    sha256 = "0idywlkw0fbakrxv65swnr5bj7f2vns9kpay7q03gzlv82p670hy";
+  };
+
+  useDune2 = true;
+
+  checkInputs = [
+    alcotest
+    fmt
+    uutf
+  ];
+  doCheck = true;
+
+  meta = {
+    description = "A simple mapper between UTF-7 to Unicode according RFC2152";
+    license = lib.licenses.mit;
+    homepage = "https://github.com/mirage/yuscii";
+    maintainers = with lib.maintainers; [ superherointj ];
+  };
+}
--- a/pkgs/development/python-modules/b2sdk/default.nix
+++ b/pkgs/development/python-modules/b2sdk/default.nix
@ -16,12 +16,12 @@

 buildPythonPackage rec {
  pname = "b2sdk";
-  version = "1.12.0";
+  version = "1.13.0";
  disabled = isPy27;

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-PsImSuK0IVY9EwpLKlP5ZFS6A7j2iJOtUg/GUcQTJR0=";
+    sha256 = "sha256-Q9B85c+WhazDeXsMR2S0aId32xLY8BAuYRj4QD21x1k=";
  };

  nativeBuildInputs = [
@ -57,7 +57,9 @@ buildPythonPackage rec {
    "test_large_file"
  ];

-  pythonImportsCheck = [ "b2sdk" ];
+  pythonImportsCheck = [
+    "b2sdk"
+  ];

  meta = with lib; {
    description = "Client library and utilities for access to B2 Cloud Storage (backblaze)";
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@ -17,13 +17,13 @@

 buildPythonPackage rec {
  pname = "debugpy";
-  version = "1.5.0";
+  version = "1.5.1";

  src = fetchFromGitHub {
    owner = "Microsoft";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-xgxKyqtSqKITwze7DKDdkxZlq1mWM+x4C/eJlUJmYuk=";
+    sha256 = "sha256-dPP4stLt5nl9B9afPmH6/hpGKXBsaTpvYZQSHxU6KaY=";
  };

  patches = [
--- a/pkgs/development/python-modules/hg-git/0.8.nix
+++ b/pkgs/development/python-modules/hg-git/0.8.nix
@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, dulwich
+, isPy3k
+, fetchpatch
+}:
+
+buildPythonPackage rec {
+  pname = "hg-git";
+  version = "0.8.12";
+  disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "13hbm0ki6s88r6p65ibvrbxnskinzdz0m9gsshb8s571p91ymfjn";
+  };
+
+  propagatedBuildInputs = [ dulwich ];
+
+  # Needs patch to work with Mercurial 4.8
+  # https://foss.heptapod.net/mercurial/hg-git/-/issues/264
+  patches = [
+    (fetchpatch {
+      url = "https://foss.heptapod.net/mercurial/hg-git/-/commit/186b37af1ff61e8141e9eea5c75a03b3c82f1ab9.diff";
+      sha256 = "sha256-KS6fUJOVzCYX/r5sdRXuFDKtlgxz80bGDFb71ISnRgc=";
+    })
+  ];
+
+  meta = with lib; {
+    description = "Push and pull from a Git server using Mercurial";
+    homepage = "https://hg-git.github.io/";
+    maintainers = with maintainers; [ koral ];
+    license = licenses.gpl2Only;
+  };
+}
--- a/pkgs/development/python-modules/hg-git/default.nix
+++ b/pkgs/development/python-modules/hg-git/default.nix
@ -2,35 +2,25 @@
 , buildPythonPackage
 , fetchPypi
 , dulwich
-, isPy3k
-, fetchpatch
+, mercurial
 }:

 buildPythonPackage rec {
  pname = "hg-git";
-  version = "0.8.12";
-  disabled = isPy3k;
+  version = "0.10.2";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "13hbm0ki6s88r6p65ibvrbxnskinzdz0m9gsshb8s571p91ymfjn";
+    sha256 = "aae1c47328bb7f928778712654c3d5f100445190e2891f175dac66d743fdb2e8";
  };

-  propagatedBuildInputs = [ dulwich ];
-
-  # Needs patch to work with Mercurial 4.8
-  # https://bitbucket.org/durin42/hg-git/issues/264/unexpected-keyword-argument-createopts-hg
-  patches =
-    fetchpatch {
-      url = "https://bitbucket.org/rsalmaso/hg-git/commits/a778506fd4be0bf1afa75755f6ee9260fa234a0f/raw";
-      sha256 = "12r4qzbc5xcqwv0kvf8g4wjji7n45421zkbf6i75vyi4nl6n4j15";
-    };
+  propagatedBuildInputs = [ dulwich mercurial ];

  meta = with lib; {
    description = "Push and pull from a Git server using Mercurial";
-    homepage = "http://hg-git.github.com/";
+    homepage = "https://hg-git.github.io/";
    maintainers = with maintainers; [ koral ];
-    license = licenses.gpl2;
+    license = licenses.gpl2Only;
  };

 }
--- a/pkgs/development/python-modules/logfury/default.nix
+++ b/pkgs/development/python-modules/logfury/default.nix
@ -2,30 +2,49 @@
 , buildPythonPackage
 , fetchPypi
 , funcsigs
-, six
+, setuptools-scm
+, pytestCheckHook
+, pythonOlder
+, testfixtures
 }:

 buildPythonPackage rec {
  pname = "logfury";
-  version = "0.1.2";
+  version = "1.0.1";
+
+  disabled = pythonOlder "3.5";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1lywirv3d1lw691mc4mfpz7ak6r49klri43bbfgdnvsfppxminj2";
+    sha256 = "sha256-EwpdrOq5rVNJJCUt33BIKqLJZmKzo4JafTCYHQO3aiY=";
  };

+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
  propagatedBuildInputs = [
    funcsigs
-    six
  ];

-  # No tests
-  doCheck = false;
+  checkInputs = [
+    pytestCheckHook
+    testfixtures
+  ];

-  meta = {
-    description = "Logfury is for python library maintainers. It allows for responsible, low-boilerplate logging of method calls.";
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "'setuptools_scm<6.0'" "'setuptools_scm'"
+  '';
+
+  pythonImportsCheck = [
+    "logfury"
+  ];
+
+  meta = with lib; {
+    description = "Python module that allows for responsible, low-boilerplate logging of method calls";
    homepage = "https://github.com/ppolewicz/logfury";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ jwiegley ];
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ jwiegley ];
  };
 }
--- a/pkgs/development/python-modules/pygls/default.nix
+++ b/pkgs/development/python-modules/pygls/default.nix
@ -36,6 +36,9 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

+  # Fixes hanging tests on Darwin
+  __darwinAllowLocalNetworking = true;
+
  pythonImportsCheck = [ "pygls" ];

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

 buildPythonPackage rec {
  pname = "pylgnetcast";
-  version = "0.3.4";
+  version = "0.3.5";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@ -15,8 +15,8 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "Drafteed";
    repo = "python-lgnetcast";
-    rev = "v${version}-1";
-    sha256 = "04bh5i4zchdg0lgwpic8wfbk77n225g71z55iin9r0083xbhd7bh";
+    rev = "v${version}";
+    sha256 = "11g7ya4ppqxjiv3fkz9mi6h1afw9icy6xyn4jzm63kjvxqhrwnw4";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/velbus-aio/default.nix
+++ b/pkgs/development/python-modules/velbus-aio/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "velbus-aio";
-  version = "2021.10.6";
+  version = "2021.10.7";

  disabled = pythonOlder "3.7";

@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "Cereal2nd";
    repo = pname;
    rev = version;
-    sha256 = "sha256-98V+skgLCMBt6cnEa9kNM5rOm9q6+QYf3TJ9P8eroM8=";
+    sha256 = "sha256-xhJKgOOi5N2oxTpy5KlRtmtb2nepp/k7TvEppkIbtWA=";
  };

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

 buildPythonPackage rec {
  pname = "zigpy";
-  version = "0.38.0";
+  version = "0.39.0";

  src = fetchFromGitHub {
    owner = "zigpy";
    repo = "zigpy";
    rev = version;
-    sha256 = "sha256-3iS2VMaicbgtsiKUPe6GjFJQV8xKjs+dC8+IeprMa9I=";
+    sha256 = "sha256-cR63xzx62ZKCXJENoksJTwEU8vGL8HtdIN3+5OqIL1Y=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/tools/backblaze-b2/default.nix
+++ b/pkgs/development/tools/backblaze-b2/default.nix
@ -12,12 +12,12 @@ let
 in
 python3Packages.buildPythonApplication rec {
  pname = "backblaze-b2";
-  version = "3.0.1";
+  version = "3.0.3";

  src = python3Packages.fetchPypi {
    inherit version;
    pname = "b2";
-    sha256 = "sha256-Zr+5J6MCjfth+5fOSfHXpT/CAgD754ZpS1b1NqeGid8=";
+    sha256 = "sha256-asrhinANGlTsSBbtGToOxTRGGSCf+1c4VWnoE3ezoIA=";
  };

  postPatch = ''
@ -39,11 +39,14 @@ python3Packages.buildPythonApplication rec {
    setuptools-scm
  ];

-  checkInputs = with python3Packages; [ pytestCheckHook ];
+  checkInputs = with python3Packages; [
+    pytestCheckHook
+  ];

  disabledTests = [
    "test_files_headers"
    "test_integration"
+    "test_get_account_info"
  ];

  postInstall = ''
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
@ -1,9 +1,9 @@
 {
  "url": "https://github.com/tree-sitter/tree-sitter-c-sharp",
-  "rev": "52ad1d506debcd4623d641339f8f452e6ea8f10c",
-  "date": "2021-09-23T08:24:24+01:00",
-  "path": "/nix/store/ag2r3d659gj14hgfgdf0nv5dwcihxy3w-tree-sitter-c-sharp",
-  "sha256": "1n8jnw2yp966svkcyh68wwwbqjhrvhykzxilj6k8rn5yx9lpymz5",
+  "rev": "1b01d838cc2c0435eef59bc4ee9d0c77eea458d0",
+  "date": "2021-10-07T21:04:41+01:00",
+  "path": "/nix/store/ghx94r76acsnz4q11nhvfwf4pmslpwz8-tree-sitter-c-sharp",
+  "sha256": "03in0smvj6f12mmc744nk772myhrd5qjswfad1vvmmhd50y35ygx",
  "fetchLFS": false,
  "fetchSubmodules": false,
  "deepClone": false,
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
@ -1,9 +1,9 @@
 {
  "url": "https://github.com/tree-sitter/tree-sitter-cpp",
-  "rev": "a7652fce5943c9d5d9c49dd8e3256a699aa33bf5",
-  "date": "2021-09-24T15:54:22-05:00",
-  "path": "/nix/store/9q4xnklmv1220yjgwdz96qf0l8swx2j6-tree-sitter-cpp",
-  "sha256": "10dbif87axvban83mglvh81gjckbp7qya0rf525s10h8ihy7rbpm",
+  "rev": "f44509141e7e483323d2ec178f2d2e6c0fc041c1",
+  "date": "2021-10-25T11:23:25-07:00",
+  "path": "/nix/store/v6034ry75lfdwsiqydff601zla6xb7a2-tree-sitter-cpp",
+  "sha256": "0hxcpdvyyig8njga1mxp4qcnbbnr1d0aiy27vahijwbh98b081nr",
  "fetchLFS": false,
  "fetchSubmodules": false,
  "deepClone": false,
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json
@ -1,9 +1,9 @@
 {
  "url": "https://github.com/rydesun/tree-sitter-dot",
-  "rev": "3a32e207e126a7f1cdd17de2473db1f03e6a3dac",
-  "date": "2021-10-05T10:30:04+08:00",
-  "path": "/nix/store/zz4sj2r6jyl7k4l7g8qggr0gv4wh5nx7-tree-sitter-dot",
-  "sha256": "17j8spga68y40fy2yizpkx7bmxp7h5p9l334w2b0685w2mnvrlgg",
+  "rev": "92877bac7033e409ccfb3f07fe28ef1dfd359457",
+  "date": "2021-10-13T19:28:51+08:00",
+  "path": "/nix/store/h3dyw3kcgw77lma750wjgr1n8pjllxn6-tree-sitter-dot",
+  "sha256": "1l8g348nqqil7lygkhzw1ydwf3q2m5786qddp1f9jg1bdrv9p8rl",
  "fetchLFS": false,
  "fetchSubmodules": false,
  "deepClone": false,
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
@ -1,9 +1,9 @@
 {
  "url": "https://github.com/tree-sitter/tree-sitter-java",
-  "rev": "2efe37f92d2e6aeb25186e9da07455bb4a30163c",
-  "date": "2021-05-04T14:05:05-07:00",
-  "path": "/nix/store/bzljwaraqj6zqpq85cz9xb0vwh7c10yj-tree-sitter-java",
-  "sha256": "09v3xg1356ghc2n0yi8iqkp80lbkav0jpfgz8iz2j1sl7ihbvkyw",
+  "rev": "ed3a87f750b1d1d533f15ab93fef3e1f5a46e234",
+  "date": "2021-10-17T09:05:07+02:00",
+  "path": "/nix/store/crd0zzw31hx5jw7m95dvpssr3pi60k5l-tree-sitter-java",
+  "sha256": "14qwmpm7dzqwby59vy1nhyddfz2lpf69ajr65s7qaqh0jcs6rs19",
  "fetchLFS": false,
  "fetchSubmodules": false,
  "deepClone": false,
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
@ -1,9 +1,10 @@
 {
-  "url": "https://github.com/nvim-neorg/tree-sitter-norg.git",
-  "rev": "84949f0c05195907c416cb7d02cf1369b9458b5f",
-  "date": "2021-09-25T17:47:36+00:00",
-  "path": "/nix/store/wa653ml1ajl8923f4am505asxwvsxbzq-tree-sitter-norg",
-  "sha256": "07pzz9acg01r4yyws6savprjn3pccyylx6vq8q9lvrp76pnflks4",
+  "url": "https://github.com/nvim-neorg/tree-sitter-norg",
+  "rev": "ff9ba2caf2c600f327370d516464d3222b9aa1f0",
+  "date": "2021-10-14T12:18:22+02:00",
+  "path": "/nix/store/4142dr4yy1jnbs7lf5kqmsn0rwyr1q7y-tree-sitter-norg",
+  "sha256": "0n74ad636p8q046sw94jxmfd640vabnzqzqjbqypyfw4fx95zwkj",
+  "fetchLFS": false,
  "fetchSubmodules": false,
  "deepClone": false,
  "leaveDotGit": false
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
@ -1,9 +1,9 @@
 {
  "url": "https://github.com/tree-sitter/tree-sitter-php",
-  "rev": "31550c1506b2033c5631cd18886edd600b67861e",
-  "date": "2021-09-27T11:44:23-07:00",
-  "path": "/nix/store/bls6gpbwqacgz7hr900khlfhbal29y27-tree-sitter-php",
-  "sha256": "1qykyziapwmw5qhd5svawzksp4w9hjdql84d7lqs3w0dfa60bjax",
+  "rev": "435fa00006c0d1515c37fbb4dd6a9de284af75ab",
+  "date": "2021-10-17T09:05:36+02:00",
+  "path": "/nix/store/0vgi25jrbc6fks97sxkya80dvwa0gzbk-tree-sitter-php",
+  "sha256": "05k4h58gi616gv41r0qqdb1x4rs8y94vghn2r10yczisgzq4vbad",
  "fetchLFS": false,
  "fetchSubmodules": false,
  "deepClone": false,
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
@ -1,9 +1,9 @@
 {
  "url": "https://github.com/tree-sitter/tree-sitter-scala",
-  "rev": "449b6baa6b1cd0c2403636459af1571e075dbaa8",
-  "date": "2021-08-31T13:42:29-07:00",
-  "path": "/nix/store/8m3s0ndhmns8435g2mlbcz9sdbqgmjz7-tree-sitter-scala",
-  "sha256": "1lmiljsd5irzc0pabxdcjgfq98xyqm76fracglq68p106mngia07",
+  "rev": "0a3dd53a7fc4b352a538397d054380aaa28be54c",
+  "date": "2021-10-10T10:34:22-07:00",
+  "path": "/nix/store/mys098cdap3mdp6x4qwlk7b9v84998b0-tree-sitter-scala",
+  "sha256": "1lwyipn5b36fskr8cm60qjblj2chf8336zkqbsifq49z1lj0wvpi",
  "fetchLFS": false,
  "fetchSubmodules": false,
  "deepClone": false,
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
@ -1,9 +1,9 @@
 {
  "url": "https://github.com/tree-sitter/tree-sitter-typescript",
-  "rev": "ef6ee5b39d6c4660809a61c1c8556fb547283864",
-  "date": "2021-10-04T11:58:33-05:00",
-  "path": "/nix/store/ny8gc7l6hpa4snhccyw3149f7s92071l-tree-sitter-typescript",
-  "sha256": "1gyim8yackz9pq6s62wrywr3gsgwa68jwvd0s6i28xxvln2r7wlb",
+  "rev": "11f8f151327e99361c1ff6764599daeef8633615",
+  "date": "2021-10-21T09:23:26-07:00",
+  "path": "/nix/store/r7vpx7g7d1hdxzqyigmr3v9yp5cmmzsg-tree-sitter-typescript",
+  "sha256": "18gk00glysqapys883hq9v33ca9x6nzgy8lk26wa5pip3spzcsm0",
  "fetchLFS": false,
  "fetchSubmodules": false,
  "deepClone": false,
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json
@ -1,9 +1,9 @@
 {
  "url": "https://github.com/vigoux/tree-sitter-viml",
-  "rev": "fd7bc35927ab44670e02d5ad035e0363f4ffde2b",
-  "date": "2021-09-27T15:41:51+02:00",
-  "path": "/nix/store/q2z07daw81cgn15z79qsfdqc2jc8ib9l-tree-sitter-viml",
-  "sha256": "0s1bp1c8p2ify67x49fv9wh0brn98lix3742zlds892985xl9zrj",
+  "rev": "1d23679256edb241ebed8da1247e340bf9e0c0ad",
+  "date": "2021-10-18T11:21:06+02:00",
+  "path": "/nix/store/5a4kihij5jcdpn73i3m7av82k4pvvzpy-tree-sitter-viml",
+  "sha256": "1660y9n1s76xcv0z27kzbbsr9bdv4c4xakzglzhl7z7qcylxg2rr",
  "fetchLFS": false,
  "fetchSubmodules": false,
  "deepClone": false,
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json
@ -1,9 +1,9 @@
 {
  "url": "https://github.com/maxxnino/tree-sitter-zig",
-  "rev": "1f27fd1dfe7f352408f01b4894c7825f3a1d6c47",
-  "date": "2021-09-20T17:51:34+09:00",
-  "path": "/nix/store/c4slv3kpl9dxi2fn6nbhar098ikpfivf-tree-sitter-zig",
-  "sha256": "1sbxvn400wizwwgjw7qcxb0z9gazvzcp3z2986lblff2xw8759vw",
+  "rev": "63e8a11f1858c7351a299223b231c8134ed61612",
+  "date": "2021-10-13T22:25:30+09:00",
+  "path": "/nix/store/2dy3wrmjss5mnmdv6xf50cjj3k9bfpp0-tree-sitter-zig",
+  "sha256": "1izvw3dv5ydklqlh8n4fslyzqdal9n8kark0g4xslcrnji3q71wg",
  "fetchLFS": false,
  "fetchSubmodules": false,
  "deepClone": false,
--- a/pkgs/games/warzone2100/default.nix
+++ b/pkgs/games/warzone2100/default.nix
@ -39,11 +39,11 @@ in

 stdenv.mkDerivation rec {
  inherit pname;
-  version  = "4.1.3";
+  version  = "4.2.0";

  src = fetchurl {
    url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz";
-    sha256 = "sha256-sKZiDjWwVFXT6RiY+zT+0S6Zb3uCC0CaZzOQYEWpWNs=";
+    sha256 = "sha256-1M77zuAqunfAjK2Jvu08Z7inCMdBYX92AmyMD9eaue8=";
  };

  buildInputs = [
--- a/pkgs/misc/emulators/ryujinx/default.nix
+++ b/pkgs/misc/emulators/ryujinx/default.nix
@ -1,4 +1,4 @@
-{ lib, buildDotnetModule, fetchFromGitHub, makeDesktopItem
+{ lib, buildDotnetModule, fetchFromGitHub, makeDesktopItem, copyDesktopItems
 , libX11, libgdiplus, ffmpeg
 , SDL2_mixer, openal, libsoundio, sndio, pulseaudio
 , gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook
@ -6,20 +6,31 @@

 buildDotnetModule rec {
  pname = "ryujinx";
-  version = "1.0.7065"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
+  version = "1.0.7086"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx

  src = fetchFromGitHub {
    owner = "Ryujinx";
    repo = "Ryujinx";
-    rev = "c54a14d0b8d445d9d0074861dca816cc801e4008";
-    sha256 = "13j91413x1bvg27vcx9sgc7gv00q84d8f5pllih5g5plzld4r541";
+    rev = "85d8d1d7cab5615e6911b7b570c8dd0b94a521ab";
+    sha256 = "11j54c7qrb7vcay8bjpv2jykdnwsjhf5cmqds43wvbicigbbds54";
  };

  projectFile = "Ryujinx.sln";
-  executables = [ "Ryujinx" ];
  nugetDeps = ./deps.nix;

-  nativeBuildInputs = [ wrapGAppsHook gobject-introspection gdk-pixbuf ];
+  dotnetFlags = [ "/p:ExtraDefineConstants=DISABLE_UPDATER" ];
+
+  # TODO: Add the headless frontend. Currently errors on the following:
+  # System.Exception: SDL2 initlaization failed with error "No available video device"
+  executables = [ "Ryujinx" ];
+
+  nativeBuildInputs = [
+    copyDesktopItems
+    wrapGAppsHook
+    gobject-introspection
+    gdk-pixbuf
+  ];
+
  runtimeDeps = [
    gtk3
    libX11
@ -48,22 +59,23 @@ buildDotnetModule rec {
    for i in 16 32 48 64 96 128 256 512 1024; do
      install -D ${src}/Ryujinx/Ui/Resources/Logo_Ryujinx.png $out/share/icons/hicolor/''${i}x$i/apps/ryujinx.png
    done
-
-    cp -r ${makeDesktopItem {
-      desktopName = "Ryujinx";
-      name = "ryujinx";
-      exec = "Ryujinx";
-      icon = "ryujinx";
-      comment = meta.description;
-      type = "Application";
-      categories = "Game;";
-    }}/share/applications $out/share
  '';

+  desktopItems = [(makeDesktopItem {
+    desktopName = "Ryujinx";
+    name = "ryujinx";
+    exec = "Ryujinx";
+    icon = "ryujinx";
+    comment = meta.description;
+    type = "Application";
+    categories = "Game;";
+  })];
+
  meta = with lib; {
    description = "Experimental Nintendo Switch Emulator written in C#";
    homepage = "https://ryujinx.org/";
    license = licenses.mit;
+    changelog = "https://github.com/Ryujinx/Ryujinx/wiki/Changelog";
    maintainers = [ maintainers.ivar ];
    platforms = [ "x86_64-linux" ];
  };
--- a/pkgs/misc/emulators/ryujinx/deps.nix
+++ b/pkgs/misc/emulators/ryujinx/deps.nix
@ -5,7 +5,7 @@
  (fetchNuGet { name = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; })
  (fetchNuGet { name = "Crc32.NET"; version = "1.2.0"; sha256 = "0qaj3192k1vfji87zf50rhydn5mrzyzybrs2k4v7ap29k8i0vi5h"; })
  (fetchNuGet { name = "DiscordRichPresence"; version = "1.0.175"; sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; })
-  (fetchNuGet { name = "FFmpeg.AutoGen"; version = "4.4.0"; sha256 = "02n4az1jv30078019png9gbspygz051inxsn6w4iar20dqp55g2w"; })
+  (fetchNuGet { name = "FFmpeg.AutoGen"; version = "4.4.1"; sha256 = "01j989g68arm2d8abq44hp0f22pp6azf2xi7wi7hv7m4sl0l9cwp"; })
  (fetchNuGet { name = "GdkSharp"; version = "3.22.25.128"; sha256 = "0bmn0ddaw8797pnhpyl03h2zl8i5ha67yv38gly4ydy50az2xhj7"; })
  (fetchNuGet { name = "GioSharp"; version = "3.22.25.128"; sha256 = "0syfa1f2hg7wsxln5lh86n8m1lihhprc51b6km91gkl25l5hw5bv"; })
  (fetchNuGet { name = "GLibSharp"; version = "3.22.25.128"; sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; })
@ -102,6 +102,7 @@
  (fetchNuGet { name = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; })
  (fetchNuGet { name = "Ryujinx.Audio.OpenAL.Dependencies"; version = "1.21.0.1"; sha256 = "0z5k42h252nr60d02p2ww9190d7k1kzrb26vil4ydfhxqqqv6w9l"; })
  (fetchNuGet { name = "Ryujinx.Graphics.Nvdec.Dependencies"; version = "4.4.0-build7"; sha256 = "0g1l3lgs0ffxp64ka81v6q1cgsdirl1qlf73255v29r3v337074m"; })
+  (fetchNuGet { name = "Ryujinx.Graphics.Nvdec.Dependencies"; version = "4.4.0-build9"; sha256 = "121zmh0byi22qsc9b25wv58kwcq6pmk7zf4f2rfafmdjvwx8bkxc"; })
  (fetchNuGet { name = "Ryujinx.SDL2-CS"; version = "2.0.17-build18"; sha256 = "0j0vs6075c4fniydqxhpp18pg3x679mq463x4gxqgkri3vhpj4vl"; })
  (fetchNuGet { name = "SharpZipLib"; version = "1.3.0"; sha256 = "1pizj82wisch28nfdaszwqm9bz19lnl0s5mq8c0zybm2vhnrhvk4"; })
  (fetchNuGet { name = "SixLabors.Fonts"; version = "1.0.0-beta0013"; sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql"; })
--- a/pkgs/misc/emulators/ryujinx/updater.sh
+++ b/pkgs/misc/emulators/ryujinx/updater.sh
@ -31,21 +31,8 @@ cp -rT "$store_src" "$src"
 chmod -R +w "$src"
 pushd "$src"

-# Setup empty nuget package folder to force reinstall.
-mkdir ./nuget_tmp.packages
-cat >./nuget_tmp.config <<EOF
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <add key="nuget" value="https://api.nuget.org/v3/index.json" />
-  </packageSources>
-  <config>
-    <add key="globalPackagesFolder" value="$(realpath ./nuget_tmp.packages)" />
-  </config>
-</configuration>
-EOF
-
-dotnet restore Ryujinx.sln --configfile ./nuget_tmp.config
+mkdir nuget_tmp.packages
+dotnet restore Ryujinx.sln --packages nuget_tmp.packages

 nuget-to-nix ./nuget_tmp.packages > "$deps_file"

--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@ -19,10 +19,10 @@ rec {
  # Policy: use the highest stable version as the default (on our master).
  stable = if stdenv.hostPlatform.system == "x86_64-linux"
    then generic {
-      version = "470.74";
-      sha256_64bit = "sha256:0snzrb78f283rl92r5cqnr7bdk3yfkqpjac80sqskwi9wgg17r9k";
-      settingsSha256 = "sha256:0hd9973l0zd8a0ia1dysfrk30jqxff1rr07b79ggvqd1xnvv0iqn";
-      persistencedSha256 = "sha256:0i8wfhz53hdnabdcx9awki3nk6xa6dadzn91iswhmfm4jj6964jf";
+      version = "495.44";
+      sha256_64bit = "0j4agxfdswadxkd9hz9j5cq4q3jmhwdnvqclxxkhl5jvh5knm1zi";
+      settingsSha256 = "0v8gqbhjsjjsc83cqacikj9bvs10bq6i34ca8l07zvsf8hfr2ziz";
+      persistencedSha256 = "19rv7vskv61q4gh59nyrfyqyqi565wzjbcfddp8wfvng4dcy18ld";
    }
    else legacy_390;

--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@ -15,7 +15,11 @@
 , autoreconfHook
 , dbus
 , enableVideo ? stdenv.isLinux
-, enableDbus ? stdenv.isLinux
+  # The implementation is buggy and produces an error like
+  # Name Error (Connection ":1.4380" is not allowed to own the service "org.linuxtv.Zbar" due to security policies in the configuration file)
+  # for every scanned code.
+  # see https://github.com/mchehab/zbar/issues/104
+, enableDbus ? false
 , libintl
 }:

--- a/pkgs/tools/misc/android-tools/default.nix
+++ b/pkgs/tools/misc/android-tools/default.nix
@ -9,11 +9,11 @@ in

 stdenv.mkDerivation rec {
  pname = "android-tools";
-  version = "31.0.2";
+  version = "31.0.3";

  src = fetchurl {
    url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz";
-    sha256 = "sha256-YbO/bCQMsLTQzP72lsVZhuBmV4Q2J9+VD9z2iBrw+NQ=";
+    sha256 = "0adhws565ny90vzh5jpkbcai8sfs3b9acs0bgl6bm9z1nr2xklnp";
  };

  patches = [
@ -27,10 +27,6 @@ stdenv.mkDerivation rec {
    })
  ];

-  postPatch = ''
-    sed -i -E "0,/import api_pb2/ s//from google.protobuf import api_pb2/" vendor/avb/aftltool.py
-  '';
-
  nativeBuildInputs = [ cmake perl go ];
  buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 fmt_7 ];
  propagatedBuildInputs = [ pythonEnv ];
@ -43,7 +39,6 @@ stdenv.mkDerivation rec {
  '';

  postInstall = ''
-    install -Dm755 ../vendor/avb/aftltool.py -t $out/bin
    install -Dm755 ../vendor/avb/avbtool.py -t $out/bin
    install -Dm755 ../vendor/mkbootimg/mkbootimg.py $out/bin/mkbootimg
  '';
--- a/pkgs/tools/misc/depotdownloader/default.nix
+++ b/pkgs/tools/misc/depotdownloader/default.nix
@ -1,16 +1,9 @@
-{ stdenv, lib, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper
-,  dotnet-sdk_5, dotnetPackages
+{ lib
+, fetchFromGitHub
+, buildDotnetModule
 }:

-let
-  fetchNuGet = {name, version, sha256}: fetchurl {
-    name = "nuget-${name}-${version}.nupkg";
-    url = "https://www.nuget.org/api/v2/package/${name}/${version}";
-    inherit sha256;
-  };
-  deps = import ./deps.nix fetchNuGet;
-in
-stdenv.mkDerivation rec {
+buildDotnetModule rec {
  pname = "depotdownloader";
  version = "2.4.5";

@ -21,27 +14,11 @@ stdenv.mkDerivation rec {
    sha256 = "0i5qgjnliji1g408ks1034r69vqdmfnzanb0qm7jmyzwww7vwpnh";
  };

-  nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget makeWrapper ];
-
-  buildPhase = ''
-    export DOTNET_CLI_TELEMETRY_OPTOUT=1
-    export DOTNET_NOLOGO=1
-    export HOME=$TMP/home
-
-    nuget sources Add -Name tmpsrc -Source $TMP/nuget
-    nuget init ${linkFarmFromDrvs "deps" deps} $TMP/nuget
-
-    dotnet restore --source $TMP/nuget DepotDownloader/DepotDownloader.csproj
-    dotnet publish --no-restore -c Release --output $out
-  '';
-
-  installPhase = ''
-    makeWrapper ${dotnet-sdk_5}/bin/dotnet $out/bin/$pname \
-      --add-flags $out/DepotDownloader.dll
-  '';
+  projectFile = "DepotDownloader.sln";
+  nugetDeps = ./deps.nix;

  meta = with lib; {
-    description = "Steam depot downloader utilizing the SteamKit2 library.";
+    description = "Steam depot downloader utilizing the SteamKit2 library";
    license = licenses.gpl2Only;
    maintainers = [ maintainers.babbaj ];
    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
--- a/pkgs/tools/misc/depotdownloader/deps.nix
+++ b/pkgs/tools/misc/depotdownloader/deps.nix
@ -1,88 +1,9 @@
-fetchNuGet:
-[
-  (fetchNuGet {
-    name = "protobuf-net";
-    version = "3.0.101";
-    sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf";
-  })
-  (fetchNuGet {
-    name = "SteamKit2";
-    version = "2.4.0-Alpha.3";
-    sha256 = "0n48yjkyzj49kv89jbkwdq6nm9w9ng6cjhvdv0chpryx9zgasgvv";
-  })
-  (fetchNuGet {
-    name = "protobuf-net.Core";
-    version = "3.0.101";
-    sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m";
-  })
-  (fetchNuGet {
-    name = "Microsoft.NETCore.App";
-    version = "2.0.0";
-    sha256 = "0j8xkssrashyxrmdraci6kmj2gdrdxb0z61jwnzf1r9r2kqrd7d2";
-  })
-  (fetchNuGet {
-    name = "Microsoft.NETCore.DotNetAppHost";
-    version = "2.0.0";
-    sha256 = "0yixdk1rslbznrl50d6pyhg50xxr6jbfb1qpy2yd8xv44s4shgwd";
-  })
-  (fetchNuGet {
-    name = "Microsoft.NETCore.DotNetHostPolicy";
-    version = "2.0.0";
-    sha256 = "1zz9yfzcvcai4il78s3phjp1hryib2zk3w2r16v3fxm2yllssyaf";
-  })
-  (fetchNuGet {
-    name = "Microsoft.NETCore.DotNetHostResolver";
-    version = "2.0.0";
-    sha256 = "0xy45xqmdqz7r6v0g8m7c1rp761ghavjl8nzxiyrpbp0wccxl3xb";
-  })
-  (fetchNuGet {
-    name = "Microsoft.NETCore.Platforms";
-    version = "5.0.0";
-    sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc";
-  })
-  (fetchNuGet {
-    name = "Microsoft.Win32.Registry";
-    version = "5.0.0";
-    sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n";
-  })
-  (fetchNuGet {
-    name = "NETStandard.Library";
-    version = "2.0.0";
-    sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy";
-  })
-  (fetchNuGet {
-    name = "System.Collections.Immutable";
-    version = "1.7.1";
-    sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq";
-  })
-  (fetchNuGet {
-    name = "System.Memory";
-    version = "4.5.4";
-    sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y";
-  })
-  (fetchNuGet {
-    name = "System.Reflection.Emit";
-    version = "4.7.0";
-    sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp";
-  })
-  (fetchNuGet {
-    name = "System.Reflection.Emit.Lightweight";
-    version = "4.7.0";
-    sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap";
-  })
-  (fetchNuGet {
-    name = "System.Runtime.CompilerServices.Unsafe";
-    version = "4.5.3";
-    sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln";
-  })
-  (fetchNuGet {
-    name = "System.Security.AccessControl";
-    version = "5.0.0";
-    sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r";
-  })
-  (fetchNuGet {
-    name = "System.Security.Principal.Windows";
-    version = "5.0.0";
-    sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8";
-  })
+{ fetchNuGet }: [
+  (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
+  (fetchNuGet { name = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; })
+  (fetchNuGet { name = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; })
+  (fetchNuGet { name = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; })
+  (fetchNuGet { name = "SteamKit2"; version = "2.4.0-Alpha.3"; sha256 = "0n48yjkyzj49kv89jbkwdq6nm9w9ng6cjhvdv0chpryx9zgasgvv"; })
+  (fetchNuGet { name = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; })
+  (fetchNuGet { name = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; })
 ]
--- a/pkgs/tools/misc/depotdownloader/fetch-deps.sh
+++ b/pkgs/tools/misc/depotdownloader/fetch-deps.sh
@ -0,0 +1,22 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nuget-to-nix dotnet-sdk_5
+set -eo pipefail
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+deps_file="$(realpath "./deps.nix")"
+
+cd ../../../..
+store_src="$(nix-build . -A depotdownloader.src --no-out-link)"
+src="$(mktemp -d /tmp/depotdownloader-src.XXX)"
+cp -rT "$store_src" "$src"
+chmod -R +w "$src"
+
+pushd "$src"
+
+mkdir ./nuget_tmp.packages
+dotnet restore DepotDownloader.sln --packages ./nuget_tmp.packages
+
+nuget-to-nix ./nuget_tmp.packages > "$deps_file"
+
+popd
+rm -r "$src"
--- a/pkgs/tools/package-management/protontricks/default.nix
+++ b/pkgs/tools/package-management/protontricks/default.nix
@ -13,13 +13,13 @@

 buildPythonApplication rec {
  pname = "protontricks";
-  version = "1.6.0";
+  version = "1.6.1";

  src = fetchFromGitHub {
    owner = "Matoking";
    repo = pname;
    rev = version;
-    hash = "sha256-sbYIqVsuDZ2Htb6SVIe/gBA1UIvUzu4fjTjWQ7k1WFs=";
+    sha256 = "sha256-2ZOVcPCF1o8mNfHOWRFTjAEu0dWzaMxlMTcctn/ScxY=";
  };

  patches = [
--- a/pkgs/tools/package-management/protontricks/steam-run.patch
+++ b/pkgs/tools/package-management/protontricks/steam-run.patch
@ -1,5 +1,5 @@
 diff --git a/src/protontricks/cli/main.py b/src/protontricks/cli/main.py
-index 535ec9b..690c1f9 100755
+index d811cb7..a376a34 100755
 --- a/src/protontricks/cli/main.py
 +++ b/src/protontricks/cli/main.py
@@ -14,8 +14,8 @@ import sys
@ -48,7 +48,7 @@ index 535ec9b..690c1f9 100755
             steam_app=steam_app,
             use_steam_runtime=use_steam_runtime,
 -            legacy_steam_runtime_path=legacy_steam_runtime_path,
-             command=[winetricks_path, "--gui"],
+             command=[str(winetricks_path), "--gui"],
             use_bwrap=use_bwrap
         )
@@ -286,7 +276,6 @@ def main(args=None):
@ -57,7 +57,7 @@ index 535ec9b..690c1f9 100755
             use_steam_runtime=use_steam_runtime,
 -            legacy_steam_runtime_path=legacy_steam_runtime_path,
             use_bwrap=use_bwrap,
-             command=[winetricks_path] + args.winetricks_command)
+             command=[str(winetricks_path)] + args.winetricks_command)
     elif args.command:
@@ -296,7 +285,6 @@ def main(args=None):
             steam_app=steam_app,
@ -68,10 +68,10 @@ index 535ec9b..690c1f9 100755
             # Pass the command directly into the shell *without*
             # escaping it
 diff --git a/src/protontricks/steam.py b/src/protontricks/steam.py
-index e898caf..7448d11 100644
+index be5322b..552f894 100644
 --- a/src/protontricks/steam.py
 +++ b/src/protontricks/steam.py
-@@ -12,8 +12,8 @@ from .util import lower_dict
+@@ -12,8 +12,8 @@ from .util import lower_dict, is_flatpak_sandbox
 
 __all__ = (
     "COMMON_STEAM_DIRS", "SteamApp", "find_steam_path",
@ -82,7 +82,7 @@ index e898caf..7448d11 100644
     "find_proton_app", "get_steam_lib_paths", "get_compat_tool_dirs",
     "get_custom_compat_tool_installations_in_dir", "get_custom_compat_tool_installations",
     "find_current_steamid3", "get_appid_from_shortcut",
-@@ -311,37 +311,6 @@ def find_steam_path():
+@@ -318,37 +318,6 @@ def find_steam_path():
     return None, None
 
 
@ -275,7 +275,7 @@ index 5252d6c..f16dfec 100644
         os.environ["PATH"] = "".join([
             str(wine_bin_dir), os.pathsep, os.environ["PATH"]
 diff --git a/tests/cli/test_main.py b/tests/cli/test_main.py
-index e6da0fb..46b9545 100644
+index f714f2c..b03fac1 100644
 --- a/tests/cli/test_main.py
 +++ b/tests/cli/test_main.py
@@ -116,15 +116,10 @@ class TestCLIRun:
--- a/pkgs/tools/text/uniscribe/Gemfile
+++ b/pkgs/tools/text/uniscribe/Gemfile
@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "uniscribe"
--- a/pkgs/tools/text/uniscribe/Gemfile.lock
+++ b/pkgs/tools/text/uniscribe/Gemfile.lock
@ -0,0 +1,37 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    characteristics (1.4.0)
+      unicode-categories (~> 1.7)
+    paint (2.2.1)
+    rationalist (2.0.1)
+    symbolify (1.4.0)
+      characteristics (>= 0.8, < 2.0)
+    unicode-categories (1.7.0)
+    unicode-display_width (2.1.0)
+    unicode-emoji (2.9.0)
+      unicode-version (~> 1.0)
+    unicode-name (1.10.0)
+      unicode-types (~> 1.7)
+    unicode-sequence_name (1.10.0)
+    unicode-types (1.7.0)
+    unicode-version (1.1.0)
+    uniscribe (1.7.0)
+      characteristics (~> 1.4)
+      paint (>= 0.9, < 3.0)
+      rationalist (~> 2.0, >= 2.0.1)
+      symbolify (~> 1.4)
+      unicode-display_width (~> 2.1)
+      unicode-emoji (~> 2.9)
+      unicode-name (~> 1.10)
+      unicode-sequence_name (~> 1.10)
+      unicode-version (~> 1.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  uniscribe
+
+BUNDLED WITH
+   2.1.4
--- a/pkgs/tools/text/uniscribe/default.nix
+++ b/pkgs/tools/text/uniscribe/default.nix
@ -0,0 +1,30 @@
+{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper }:
+
+let
+  rubyEnv = bundlerEnv {
+    name = "uniscribe";
+    gemdir = ./.;
+  };
+in
+stdenv.mkDerivation rec {
+  pname = "uniscribe";
+  version = (import ./gemset.nix).uniscribe.version;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  dontUnpack = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    makeWrapper ${rubyEnv}/bin/uniscribe $out/bin/uniscribe
+  '';
+
+  passthru.updateScript = bundlerUpdateScript "uniscribe";
+
+  meta = with lib; {
+    description = "Explains Unicode characters/code points: Displays their name, category, and shows compositions";
+    homepage = "https://github.com/janlelis/uniscribe";
+    license = licenses.mit;
+    maintainers = with maintainers; [ kjeremy ];
+  };
+}
--- a/pkgs/tools/text/uniscribe/gemset.nix
+++ b/pkgs/tools/text/uniscribe/gemset.nix
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -5343,6 +5343,8 @@ with pkgs;

  uni2ascii = callPackage ../tools/text/uni2ascii { };

+  uniscribe = callPackage ../tools/text/uniscribe { };
+
  galculator = callPackage ../applications/misc/galculator {
    gtk = gtk3;
  };
@ -26376,6 +26378,10 @@ with pkgs;

  mda_lv2 = callPackage ../applications/audio/mda-lv2 { };

+  mdzk = callPackage ../applications/misc/mdzk {
+    inherit (darwin.apple_sdk.frameworks) CoreServices;
+  };
+
  mediaelch = libsForQt5.callPackage ../applications/misc/mediaelch { };

  mediainfo = callPackage ../applications/misc/mediainfo { };
@ -32846,7 +32852,7 @@ with pkgs;

  vault-bin = callPackage ../tools/security/vault/vault-bin.nix { };

-  vaultenv = haskellPackages.vaultenv;
+  vaultenv = haskell.lib.justStaticExecutables haskellPackages.vaultenv;

  vazir-code-font = callPackage ../data/fonts/vazir-code-font { };

--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@ -195,6 +195,8 @@ let

    conduit-mirage = callPackage ../development/ocaml-modules/conduit/mirage.nix { };

+    coin =  callPackage ../development/ocaml-modules/coin { };
+
    config-file = callPackage ../development/ocaml-modules/config-file { };

    containers = callPackage ../development/ocaml-modules/containers { };
@ -820,6 +822,8 @@ let

    mparser-pcre =  callPackage ../development/ocaml-modules/mparser/pcre.nix { };

+    mrmime = callPackage ../development/ocaml-modules/mrmime { };
+
    mtime =  callPackage ../development/ocaml-modules/mtime { };

    mustache =  callPackage ../development/ocaml-modules/mustache { };
@ -1176,6 +1180,8 @@ let

    ppx_yojson_conv_lib = callPackage ../development/ocaml-modules/ppx_yojson_conv_lib {};

+    prettym = callPackage ../development/ocaml-modules/prettym { };
+
    printbox = callPackage ../development/ocaml-modules/printbox { };

    process = callPackage ../development/ocaml-modules/process { };
@ -1235,6 +1241,8 @@ let

    rope = callPackage ../development/ocaml-modules/rope { };

+    rosetta = callPackage ../development/ocaml-modules/rosetta { };
+
    routes = callPackage ../development/ocaml-modules/routes { };

    rpclib = callPackage ../development/ocaml-modules/rpclib { };
@ -1355,6 +1363,8 @@ let

    stdint = callPackage ../development/ocaml-modules/stdint { };

+    unstrctrd = callPackage ../development/ocaml-modules/unstrctrd { };
+
    uucd = callPackage ../development/ocaml-modules/uucd { };
    uucp = callPackage ../development/ocaml-modules/uucp { };
    uunf = callPackage ../development/ocaml-modules/uunf { };
@ -1366,6 +1376,8 @@ let
    uuseg = callPackage ../development/ocaml-modules/uuseg { };
    uutf = callPackage ../development/ocaml-modules/uutf { };

+    uuuu = callPackage ../development/ocaml-modules/uuuu { };
+
    variantslib_p4 = callPackage ../development/ocaml-modules/variantslib { };

    vchan = callPackage ../development/ocaml-modules/vchan { };
@ -1412,6 +1424,8 @@ let

    yojson = callPackage ../development/ocaml-modules/yojson { };

+    yuscii = callPackage ../development/ocaml-modules/yuscii { };
+
    z3 = callPackage ../development/ocaml-modules/z3 {
      inherit (pkgs) z3;
    };
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -3442,6 +3442,8 @@ in {

  hg-evolve = callPackage ../development/python-modules/hg-evolve { };

+  hg-git = callPackage ../development/python-modules/hg-git { };
+
  hglib = callPackage ../development/python-modules/hglib { };

  hickle = callPackage ../development/python-modules/hickle { };
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@ -170,7 +170,7 @@ with self; with super; {
    pythonPackages = self;
  });

-  hg-git = callPackage ../development/python-modules/hg-git { };
+  hg-git = callPackage ../development/python-modules/hg-git/0.8.nix { };

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