Project import generated by Copybara.

GitOrigin-RevId: c90c4025bb6e0c4eaf438128a3b2640314b1c58d
2023-03-08 18:32:21 +02:00 · 2023-03-08 18:32:21 +02:00 · dae973cb59
commit dae973cb59
parent 40baed5b59
649 changed files with 12959 additions and 7155 deletions
--- a/third_party/nixpkgs/.github/workflows/backport.yml
+++ b/third_party/nixpkgs/.github/workflows/backport.yml
@ -27,6 +27,7 @@ jobs:
        uses: korthout/backport-action@v1.2.0
        with:
          # Config README: https://github.com/korthout/backport-action#backport-action
+          copy_labels_pattern: 'severity:\ssecurity'
          pull_description: |-
            Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}.

--- a/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml
+++ b/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml
@ -8,6 +8,7 @@ on:
      - master
    paths:
      - 'doc/**'
+      - 'lib/**'

 jobs:
  nixpkgs:
--- a/third_party/nixpkgs/lib/debug.nix
+++ b/third_party/nixpkgs/lib/debug.nix
@ -250,90 +250,4 @@ rec {
       { testX = allTrue [ true ]; }
  */
  testAllTrue = expr: { inherit expr; expected = map (x: true) expr; };
-
-
-  # -- DEPRECATED --
-
-  traceShowVal = x: trace (showVal x) x;
-  traceShowValMarked = str: x: trace (str + showVal x) x;
-
-  attrNamesToStr = a:
-    trace ( "Warning: `attrNamesToStr` is deprecated "
-          + "and will be removed in the next release. "
-          + "Please use more specific concatenation "
-          + "for your uses (`lib.concat(Map)StringsSep`)." )
-    (concatStringsSep "; " (map (x: "${x}=") (attrNames a)));
-
-  showVal =
-    trace ( "Warning: `showVal` is deprecated "
-          + "and will be removed in the next release, "
-          + "please use `traceSeqN`" )
-    (let
-      modify = v:
-        let pr = f: { __pretty = f; val = v; };
-        in   if isDerivation v then pr
-          (drv: "<δ:${drv.name}:${concatStringsSep ","
-                                 (attrNames drv)}>")
-        else if [] ==   v then pr (const "[]")
-        else if isList  v then pr (l: "[ ${go (head l)}, … ]")
-        else if isAttrs v then pr
-          (a: "{ ${ concatStringsSep ", " (attrNames a)} }")
-        else v;
-      go = x: generators.toPretty
-        { allowPrettyValues = true; }
-        (modify x);
-    in go);
-
-  traceXMLVal = x:
-    trace ( "Warning: `traceXMLVal` is deprecated "
-          + "and will be removed in the next release. "
-          + "Please use `traceValFn builtins.toXML`." )
-    (trace (builtins.toXML x) x);
-  traceXMLValMarked = str: x:
-    trace ( "Warning: `traceXMLValMarked` is deprecated "
-          + "and will be removed in the next release. "
-          + "Please use `traceValFn (x: str + builtins.toXML x)`." )
-    (trace (str + builtins.toXML x) x);
-
-  # trace the arguments passed to function and its result
-  # maybe rewrite these functions in a traceCallXml like style. Then one function is enough
-  traceCall  = n: f: a: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a));
-  traceCall2 = n: f: a: b: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b));
-  traceCall3 = n: f: a: b: c: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b) (t "arg 3" c));
-
-  traceValIfNot = c: x:
-    trace ( "Warning: `traceValIfNot` is deprecated "
-          + "and will be removed in the next release. "
-          + "Please use `if/then/else` and `traceValSeq 1`.")
-    (if c x then true else traceSeq (showVal x) false);
-
-
-  addErrorContextToAttrs = attrs:
-    trace ( "Warning: `addErrorContextToAttrs` is deprecated "
-          + "and will be removed in the next release. "
-          + "Please use `builtins.addErrorContext` directly." )
-    (mapAttrs (a: v: addErrorContext "while evaluating ${a}" v) attrs);
-
-  # example: (traceCallXml "myfun" id 3) will output something like
-  # calling myfun arg 1: 3 result: 3
-  # this forces deep evaluation of all arguments and the result!
-  # note: if result doesn't evaluate you'll get no trace at all (FIXME)
-  #       args should be printed in any case
-  traceCallXml = a:
-    trace ( "Warning: `traceCallXml` is deprecated "
-          + "and will be removed in the next release. "
-          + "Please complain if you use the function regularly." )
-    (if !isInt a then
-      traceCallXml 1 "calling ${a}\n"
-    else
-      let nr = a;
-      in (str: expr:
-          if isFunction expr then
-            (arg:
-              traceCallXml (builtins.add 1 nr) "${str}\n arg ${builtins.toString nr} is \n ${builtins.toXML (builtins.seq arg arg)}" (expr arg)
-            )
-          else
-            let r = builtins.seq expr expr;
-            in trace "${str}\n result:\n${builtins.toXML r}" r
-      ));
 }
--- a/third_party/nixpkgs/lib/default.nix
+++ b/third_party/nixpkgs/lib/default.nix
@ -145,11 +145,10 @@ let
      isOptionType mkOptionType;
    inherit (self.asserts)
      assertMsg assertOneOf;
-    inherit (self.debug) addErrorContextToAttrs traceIf traceVal traceValFn
-      traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq
-      traceValSeqFn traceValSeqN traceValSeqNFn traceFnSeqN traceShowVal
-      traceShowValMarked showVal traceCall traceCall2 traceCall3
-      traceValIfNot runTests testAllTrue traceCallXml attrNamesToStr;
+    inherit (self.debug) traceIf traceVal traceValFn
+      traceSeq traceSeqN traceValSeq
+      traceValSeqFn traceValSeqN traceValSeqNFn traceFnSeqN
+      runTests testAllTrue;
    inherit (self.misc) maybeEnv defaultMergeArg defaultMerge foldArgs
      maybeAttrNullable maybeAttr ifEnable checkFlag getValue
      checkReqs uniqList uniqListExt condConcat lazyGenericClosure
--- a/third_party/nixpkgs/lib/licenses.nix
+++ b/third_party/nixpkgs/lib/licenses.nix
@ -81,7 +81,6 @@ in mkLicense lset) ({
  apsl10 = {
    spdxId = "APSL-1.0";
    fullName = "Apple Public Source License 1.0";
-    url = "https://web.archive.org/web/20040701000000*/http://www.opensource.apple.com/apsl/1.0.txt";
  };

  apsl20 = {
@ -225,6 +224,12 @@ in mkLicense lset) ({
    fullName = "Creative Commons Zero v1.0 Universal";
  };

+  cc-by-nc-nd-30 = {
+    spdxId = "CC-BY-NC-ND-3.0";
+    fullName = "Creative Commons Attribution Non Commercial No Derivative Works 3.0 Unported";
+    free = false;
+  };
+
  cc-by-nc-sa-20 = {
    spdxId = "CC-BY-NC-SA-2.0";
    fullName = "Creative Commons Attribution Non Commercial Share Alike 2.0";
--- a/third_party/nixpkgs/lib/options.nix
+++ b/third_party/nixpkgs/lib/options.nix
@ -110,10 +110,6 @@ rec {
  /* Creates an Option attribute set for an option that specifies the
     package a module should use for some purpose.

-     Type: mkPackageOption :: pkgs -> (string|[string]) ->
-      { default? :: [string], example? :: null|string|[string], extraDescription? :: string } ->
-      option
-
     The package is specified in the third argument under `default` as a list of strings
     representing its attribute path in nixpkgs (or another package set).
     Because of this, you need to pass nixpkgs itself (or a subset) as the first argument.
@ -133,6 +129,8 @@ rec {

     If you wish to explicitly provide no default, pass `null` as `default`.

+     Type: mkPackageOption :: pkgs -> (string|[string]) -> { default? :: [string], example? :: null|string|[string], extraDescription? :: string } -> option
+
     Example:
       mkPackageOption pkgs "hello" { }
       => { _type = "option"; default = «derivation /nix/store/3r2vg51hlxj3cx5vscp0vkv60bqxkaq0-hello-2.10.drv»; defaultText = { ... }; description = "The hello package to use."; type = { ... }; }
@ -157,11 +155,11 @@ rec {
      # Name for the package, shown in option description
      name:
      {
-        # The attribute path where the default package is located
+        # The attribute path where the default package is located (may be omitted)
        default ? name,
-        # A string or an attribute path to use as an example
+        # A string or an attribute path to use as an example (may be omitted)
        example ? null,
-        # Additional text to include in the option description
+        # Additional text to include in the option description (may be omitted)
        extraDescription ? "",
      }:
      let
--- a/third_party/nixpkgs/lib/strings.nix
+++ b/third_party/nixpkgs/lib/strings.nix
@ -4,6 +4,8 @@ let

 inherit (builtins) length;

+asciiTable = import ./ascii-table.nix;
+
 in

 rec {
@ -34,8 +36,6 @@ rec {
    unsafeDiscardStringContext
    ;

-  asciiTable = import ./ascii-table.nix;
-
  /* Concatenate a list of strings.

    Type: concatStrings :: [string] -> string
--- a/third_party/nixpkgs/lib/systems/parse.nix
+++ b/third_party/nixpkgs/lib/systems/parse.nix
@ -182,23 +182,12 @@ rec {
    (b == armv7l && isCompatible a armv7a)
    (b == armv7l && isCompatible a armv7r)
    (b == armv7l && isCompatible a armv7m)
-    (b == armv7a && isCompatible a armv8a)
-    (b == armv7r && isCompatible a armv8a)
-    (b == armv7m && isCompatible a armv8a)
-    (b == armv7a && isCompatible a armv8r)
-    (b == armv7r && isCompatible a armv8r)
-    (b == armv7m && isCompatible a armv8r)
-    (b == armv7a && isCompatible a armv8m)
-    (b == armv7r && isCompatible a armv8m)
-    (b == armv7m && isCompatible a armv8m)

    # ARMv8
-    (b == armv8r && isCompatible a armv8a)
-    (b == armv8m && isCompatible a armv8a)
-
-    # XXX: not always true! Some arm64 cpus don’t support arm32 mode.
    (b == aarch64 && a == armv8a)
    (b == armv8a && isCompatible a aarch64)
+    (b == armv8r && isCompatible a armv8a)
+    (b == armv8m && isCompatible a armv8a)

    # PowerPC
    (b == powerpc && isCompatible a powerpc64)
--- a/third_party/nixpkgs/maintainers/maintainer-list.nix
+++ b/third_party/nixpkgs/maintainers/maintainer-list.nix
@ -206,6 +206,12 @@
    githubId = 22131756;
    name = "Aaqa Ishtyaq";
  };
+  aaronarinder = {
+    email = "aaronarinder@gmail.com";
+    github = "aaronArinder";
+    githubId = 26738844;
+    name = "Aaron Arinder";
+  };
  aaronjanse = {
    email = "aaron@ajanse.me";
    matrix = "@aaronjanse:matrix.org";
@ -1090,6 +1096,12 @@
    githubId = 1078530;
    name = "Alexandre Peyroux";
  };
+  apfelkuchen6 = {
+    email = "apfelkuchen6@hrnz.li";
+    github = "apfelkuchen6";
+    githubId = 73002165;
+    name = "apfelkuchen6";
+  };
  applePrincess = {
    email = "appleprincess@appleprincess.io";
    github = "applePrincess";
@ -2279,6 +2291,12 @@
    githubId = 15320726;
    name = "Car Cdr";
  };
+  caarlos0 = {
+    name = "Carlos A Becker";
+    email = "carlos@becker.software";
+    github = "caarlos0";
+    githubId = 245435;
+  };
  cab404 = {
    email = "cab404@mailbox.org";
    github = "cab404";
@ -2986,6 +3004,13 @@
    githubId = 40290417;
    name = "Seb Blair";
  };
+  connorbaker = {
+    email = "connor.baker@tweag.io";
+    matrix = "@connorbaker:matrix.org";
+    github = "connorbaker";
+    name = "Connor Baker";
+    githubId = 3880346;
+  };
  considerate = {
    email = "viktor.kronvall@gmail.com";
    github = "considerate";
@ -5231,6 +5256,12 @@
    githubId = 606000;
    name = "Gabriel Adomnicai";
  };
+  GabrielDougherty = {
+    email = "contact@gabrieldougherty.com";
+    github = "GabrielDougherty";
+    githubId = 10541219;
+    name = "Gabriel Dougherty";
+  };
  garaiza-93 = {
    email = "araizagustavo93@gmail.com";
    github = "garaiza-93";
@ -7918,6 +7949,12 @@
    githubId = 804677;
    name = "Kirill Kazakov";
  };
+  kirillrdy = {
+    email = "kirillrdy@gmail.com";
+    github = "kirillrdy";
+    githubId = 12160;
+    name = "Kirill Radzikhovskyy";
+  };
  kisonecat = {
    email = "kisonecat@gmail.com";
    github = "kisonecat";
@ -8043,6 +8080,13 @@
    githubId = 15692230;
    name = "Muhammad Herdiansyah";
  };
+  konradmalik = {
+    email = "konrad.malik@gmail.com";
+    matrix = "@konradmalik:matrix.org";
+    name = "Konrad Malik";
+    github = "konradmalik";
+    githubId = 13033392;
+  };
  koozz = {
    email = "koozz@linux.com";
    github = "koozz";
@ -9817,6 +9861,12 @@
    githubId = 5378535;
    name = "Milo Gertjejansen";
  };
+  milran = {
+    email = "milranmike@protonmail.com";
+    github = "milran";
+    githubId = 93639059;
+    name = "Milran Mike";
+  };
  mimame = {
    email = "miguel.madrid.mencia@gmail.com";
    github = "mimame";
@ -12068,6 +12118,15 @@
    githubId = 4633847;
    name = "Ben Hamlin";
  };
+  prrlvr = {
+    email = "po@prrlvr.fr";
+    github = "prrlvr";
+    githubId = 33699501;
+    name = "Pierre-Olivier Rey";
+    keys = [{
+      fingerprint = "40A0 78FD 297B 0AC1 E6D8  A119 4D38 49D9 9555 1307";
+    }];
+  };
  prusnak = {
    email = "pavol@rusnak.io";
    github = "prusnak";
@ -12302,6 +12361,12 @@
    githubId = 314564;
    name = "Ryan Lahfa";
  };
+  ralismark = {
+    email = "nixpkgs@ralismark.xyz";
+    github = "ralismark";
+    githubId = 13449732;
+    name = "Temmie";
+  };
  raphaelr = {
    email = "raphael-git@tapesoftware.net";
    matrix = "@raphi:tapesoftware.net";
@ -12935,12 +13000,23 @@
    githubId = 61306;
    name = "Rene Treffer";
  };
+  ruby0b = {
+    github = "ruby0b";
+    githubId = 106119328;
+    name = "ruby0b";
+  };
  rubyowo = {
    name = "Rei Star";
    email = "perhaps-you-know@what-is.ml";
    github = "rubyowo";
    githubId = 105302757;
  };
+  Ruixi-rebirth = {
+    name = "Ruixi-rebirth";
+    email = "ruixirebirth@gmail.com";
+    github = "Ruixi-rebirth";
+    githubId = 75824585;
+  };
  rumpelsepp = {
    name = "Stefan Tatschner";
    email = "stefan@rumpelsepp.org";
@ -12995,6 +13071,12 @@
    githubId = 12877905;
    name = "Roman Volosatovs";
  };
+  rxiao = {
+    email = "ben.xiao@me.com";
+    github = "benxiao";
+    githubId = 10908495;
+    name = "Ran Xiao";
+  };
  ryanartecona = {
    email = "ryanartecona@gmail.com";
    github = "ryanartecona";
@ -14785,6 +14867,15 @@
      fingerprint = "38A0 29B0 4A7E 4C13 A4BB  86C8 7D51 0786 6B1C 6752";
    }];
  };
+  thekostins = {
+    name = "Konstantin";
+    email = "anisimovkosta19@gmail.com";
+    github = "TheKostins";
+    githubId = 39405421;
+    keys = [{
+      fingerprint = "B216 7B33 E248 097F D82A  991D C94D 589A 4D0D CDD2";
+    }];
+  };
  thelegy = {
    email = "mail+nixos@0jb.de";
    github = "thelegy";
--- a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv
+++ b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv
@ -19,6 +19,7 @@ fennel,,,,,,misterio77
 fifo,,,,,,
 fluent,,,,,,alerque
 gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1,
+haskell-tools.nvim,,,,,,
 http,,,,0.3-0,,vcunat
 inspect,,,,,,
 jsregexp,,,,,,
@ -102,6 +103,8 @@ std._debug,https://github.com/lua-stdlib/_debug.git,,,,,
 std.normalize,https://github.com/lua-stdlib/normalize.git,,,,,
 stdlib,,,,41.2.2,,vyp
 teal-language-server,,,http://luarocks.org/dev,,,
+telescope.nvim,,,,,5.1,
+telescope-manix,,,,,,
 tl,,,,,,mephistophiles
 vstruct,https://github.com/ToxicFrog/vstruct.git,,,,,
 vusted,,,,,,figsoda
--- a/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix
+++ b/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix
@ -61,9 +61,9 @@ with lib;
      pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; };
      qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; };
      qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; });
-      qt5 = super.qt5.overrideScope' (self': super': {
+      qt5 = super.qt5.overrideScope' (const (super': {
        qtbase = super'.qtbase.override { withGtk3 = false; };
-      });
+      }));
      stoken = super.stoken.override { withGTK3 = false; };
      # translateManpages -> perlPackages.po4a -> texlive-combined-basic -> texlive-core-big -> libX11
      util-linux = super.util-linux.override { translateManpages = false; };
--- a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix
+++ b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix
@ -180,7 +180,7 @@ in
        #   extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
        #   packages = with pkgs; [
        #     firefox
-        #     thunderbird
+        #     tree
        #   ];
        # };

--- a/third_party/nixpkgs/nixos/modules/module-list.nix
+++ b/third_party/nixpkgs/nixos/modules/module-list.nix
@ -205,6 +205,7 @@
  ./programs/nbd.nix
  ./programs/neovim.nix
  ./programs/nethoscope.nix
+  ./programs/nexttrace.nix
  ./programs/nix-index.nix
  ./programs/nix-ld.nix
  ./programs/nm-applet.nix
--- a/third_party/nixpkgs/nixos/modules/programs/atop.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/atop.nix
@ -142,6 +142,7 @@ in
              # convert remainings logs and start eventually
              atop.serviceConfig.ExecStartPre = pkgs.writeShellScript "atop-update-log-format" ''
                set -e -u
+                shopt -s nullglob
                for logfile in "$LOGPATH"/atop_*
                do
                  ${atop}/bin/atopconvert "$logfile" "$logfile".new
--- a/third_party/nixpkgs/nixos/modules/programs/nexttrace.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/nexttrace.nix
@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.programs.nexttrace;
+
+in
+{
+  options = {
+    programs.nexttrace = {
+      enable = lib.mkEnableOption (lib.mdDoc "Nexttrace to the global environment and configure a setcap wrapper for it");
+      package = lib.mkPackageOptionMD pkgs "nexttrace" { };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+
+    security.wrappers.nexttrace = {
+      owner = "root";
+      group = "root";
+      capabilities = "cap_net_raw,cap_net_admin+eip";
+      source = "${cfg.package}/bin/nexttrace";
+    };
+  };
+}
--- a/third_party/nixpkgs/nixos/modules/programs/waybar.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/waybar.nix
@ -2,17 +2,22 @@

 with lib;

+let
+  cfg = config.programs.waybar;
+in
 {
  options.programs.waybar = {
    enable = mkEnableOption (lib.mdDoc "waybar");
+    package = mkPackageOptionMD pkgs "waybar" { };
  };

-  config = mkIf config.programs.waybar.enable {
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
    systemd.user.services.waybar = {
      description = "Waybar as systemd service";
      wantedBy = [ "graphical-session.target" ];
      partOf = [ "graphical-session.target" ];
-      script = "${pkgs.waybar}/bin/waybar";
+      script = "${cfg.package}/bin/waybar";
    };
  };

--- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner/service.nix
+++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner/service.nix
@ -149,7 +149,7 @@ in
              else
                args+=(--token "$token")
              fi
-              ${cfg.package}/bin/config.sh "''${args[@]}"
+              ${cfg.package}/bin/Runner.Listener configure "''${args[@]}"
              # Move the automatically created _diag dir to the logs dir
              mkdir -p  "$STATE_DIRECTORY/_diag"
              cp    -r  "$STATE_DIRECTORY/_diag/." "$LOGS_DIRECTORY/"
--- a/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix
@ -42,6 +42,8 @@ let
    ${if cfg.sslKey  == "" then "" else "sslKey="+cfg.sslKey}
    ${if cfg.sslCa   == "" then "" else "sslCA="+cfg.sslCa}

+    ${lib.optionalString (cfg.dbus != null) "dbus=${cfg.dbus}"}
+
    ${cfg.extraConfig}
  '';
 in
@ -282,6 +284,12 @@ in
          `murmur` is running.
        '';
      };
+
+      dbus = mkOption {
+        type = types.enum [ null "session" "system" ];
+        default = null;
+        description = lib.mdDoc "Enable D-Bus remote control. Set to the bus you want Murmur to connect to.";
+      };
    };
  };

@ -325,5 +333,27 @@ in
        Group = "murmur";
      };
    };
+
+    # currently not included in upstream package, addition requested at
+    # https://github.com/mumble-voip/mumble/issues/6078
+    services.dbus.packages = mkIf (cfg.dbus == "system") [(pkgs.writeTextFile {
+      name = "murmur-dbus-policy";
+      text = ''
+        <!DOCTYPE busconfig PUBLIC
+          "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+          "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+        <busconfig>
+          <policy user="murmur">
+            <allow own="net.sourceforge.mumble.murmur"/>
+          </policy>
+
+          <policy context="default">
+            <allow send_destination="net.sourceforge.mumble.murmur"/>
+            <allow receive_sender="net.sourceforge.mumble.murmur"/>
+          </policy>
+        </busconfig>
+      '';
+      destination = "/share/dbus-1/system.d/murmur.conf";
+    })];
  };
 }
--- a/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix
@ -461,7 +461,7 @@ let

          ${ipPreMove} link add dev "${name}" type wireguard
          ${optionalString (values.interfaceNamespace != null && values.interfaceNamespace != values.socketNamespace) ''${ipPreMove} link set "${name}" netns "${ns}"''}
-          ${optionalString (values.mtu != null) ''${ipPreMove} link set "${name}" mtu ${toString values.mtu}''}
+          ${optionalString (values.mtu != null) ''${ipPostMove} link set "${name}" mtu ${toString values.mtu}''}

          ${concatMapStringsSep "\n" (ip:
            ''${ipPostMove} address add "${ip}" dev "${name}"''
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/dolibarr.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/dolibarr.nix
@ -5,7 +5,7 @@ let
  package = pkgs.dolibarr.override { inherit (cfg) stateDir; };

  cfg = config.services.dolibarr;
-  vhostCfg = lib.optionalAttr (cfg.nginx != null) config.services.nginx.virtualHosts."${cfg.domain}";
+  vhostCfg = lib.optionalAttrs (cfg.nginx != null) config.services.nginx.virtualHosts."${cfg.domain}";

  mkConfigFile = filename: settings:
    let
--- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
@ -112,10 +112,8 @@ let
  ''));

  commonHttpConfig = ''
-      # The mime type definitions included with nginx are very incomplete, so
-      # we use a list of mime types from the mailcap package, which is also
-      # used by most other Linux distributions by default.
-      include ${pkgs.mailcap}/etc/nginx/mime.types;
+      # Load mime types.
+      include ${cfg.defaultMimeTypes};
      # When recommendedOptimisation is disabled nginx fails to start because the mailmap mime.types database
      # contains 1026 entries and the default is only 1024. Setting to a higher number to remove the need to
      # overwrite it because nginx does not allow duplicated settings.
@ -529,6 +527,18 @@ in
        '';
      };

+      defaultMimeTypes = mkOption {
+        type = types.path;
+        default = "${pkgs.mailcap}/etc/nginx/mime.types";
+        defaultText = literalExpression "$''{pkgs.mailcap}/etc/nginx/mime.types";
+        example = literalExpression "$''{pkgs.nginx}/conf/mime.types";
+        description = lib.mdDoc ''
+          Default MIME types for NGINX, as MIME types definitions from NGINX are very incomplete,
+          we use by default the ones bundled in the mailcap package, used by most of the other
+          Linux distributions.
+        '';
+      };
+
      package = mkOption {
        default = pkgs.nginxStable;
        defaultText = literalExpression "pkgs.nginxStable";
--- a/third_party/nixpkgs/nixos/tests/all-tests.nix
+++ b/third_party/nixpkgs/nixos/tests/all-tests.nix
@ -243,6 +243,7 @@ in {
  ghostunnel = handleTest ./ghostunnel.nix {};
  gitdaemon = handleTest ./gitdaemon.nix {};
  gitea = handleTest ./gitea.nix { giteaPackage = pkgs.gitea; };
+  github-runner = handleTest ./github-runner.nix {};
  gitlab = handleTest ./gitlab.nix {};
  gitolite = handleTest ./gitolite.nix {};
  gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix {};
--- a/third_party/nixpkgs/nixos/tests/github-runner.nix
+++ b/third_party/nixpkgs/nixos/tests/github-runner.nix
@ -0,0 +1,37 @@
+import ./make-test-python.nix ({ pkgs, ... }:
+{
+  name = "github-runner";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [ veehaitch ];
+  };
+  nodes.machine = { pkgs, ... }: {
+    services.github-runners.test = {
+      enable = true;
+      url = "https://github.com/yaxitech";
+      tokenFile = builtins.toFile "github-runner.token" "not-so-secret";
+    };
+
+    systemd.services.dummy-github-com = {
+      wantedBy = [ "multi-user.target" ];
+      before = [ "github-runner-test.service" ];
+      script = "${pkgs.netcat}/bin/nc -Fl 443 | true && touch /tmp/registration-connect";
+    };
+    networking.hosts."127.0.0.1" = [ "api.github.com" ];
+  };
+
+  testScript = ''
+    start_all()
+
+    machine.wait_for_unit("dummy-github-com")
+
+    try:
+      machine.wait_for_unit("github-runner-test")
+    except Exception:
+      pass
+
+    out = machine.succeed("journalctl -u github-runner-test")
+    assert "Self-hosted runner registration" in out, "did not read runner registration header"
+
+    machine.wait_until_succeeds("test -f /tmp/registration-connect")
+  '';
+})
--- a/third_party/nixpkgs/nixos/tests/hostname.nix
+++ b/third_party/nixpkgs/nixos/tests/hostname.nix
@ -1,6 +1,6 @@
-{ system ? builtins.currentSystem,
-  config ? {},
-  pkgs ? import ../.. { inherit system config; }
+{ system ? builtins.currentSystem
+, config ? { }
+, pkgs ? import ../.. { inherit system config; }
 }:

 with import ../lib/testing-python.nix { inherit system pkgs; };
@ -14,56 +14,56 @@ let
        let res = builtins.tryEval str;
        in if (res.success && res.value != null) then res.value else "null";
    in
-      makeTest {
-        name = "hostname-${fqdn}";
-        meta = with pkgs.lib.maintainers; {
-          maintainers = [ primeos blitz ];
-        };
-
-        nodes.machine = { lib, ... }: {
-          networking.hostName = hostName;
-          networking.domain = domain;
-
-          environment.systemPackages = with pkgs; [
-            inetutils
-          ];
-        };
-
-        testScript = { nodes, ... }: ''
-          start_all()
-
-          machine = ${hostName}
-
-          machine.wait_for_unit("network-online.target")
-
-          # Test if NixOS computes the correct FQDN (either a FQDN or an error/null):
-          assert "${getStr nodes.machine.config.networking.fqdn}" == "${getStr fqdnOrNull}"
-
-          # The FQDN, domain name, and hostname detection should work as expected:
-          assert "${fqdn}" == machine.succeed("hostname --fqdn").strip()
-          assert "${optionalString (domain != null) domain}" == machine.succeed("dnsdomainname").strip()
-          assert (
-              "${hostName}"
-              == machine.succeed(
-                  'hostnamectl status | grep "Static hostname" | cut -d: -f2'
-              ).strip()
-          )
-
-          # 127.0.0.1 and ::1 should resolve back to "localhost":
-          assert (
-              "localhost" == machine.succeed("getent hosts 127.0.0.1 | awk '{print $2}'").strip()
-          )
-          assert "localhost" == machine.succeed("getent hosts ::1 | awk '{print $2}'").strip()
-
-          # 127.0.0.2 should resolve back to the FQDN and hostname:
-          fqdn_and_host_name = "${optionalString (domain != null) "${hostName}.${domain} "}${hostName}"
-          assert (
-              fqdn_and_host_name
-              == machine.succeed("getent hosts 127.0.0.2 | awk '{print $2,$3}'").strip()
-          )
-        '';
+    makeTest {
+      name = "hostname-${fqdn}";
+      meta = with pkgs.lib.maintainers; {
+        maintainers = [ primeos blitz ];
      };

+      nodes.machine = { lib, ... }: {
+        networking.hostName = hostName;
+        networking.domain = domain;
+
+        environment.systemPackages = with pkgs; [
+          inetutils
+        ];
+      };
+
+      testScript = { nodes, ... }: ''
+        start_all()
+
+        machine = ${hostName}
+
+        machine.wait_for_unit("network-online.target")
+
+        # Test if NixOS computes the correct FQDN (either a FQDN or an error/null):
+        assert "${getStr nodes.machine.networking.fqdn}" == "${getStr fqdnOrNull}"
+
+        # The FQDN, domain name, and hostname detection should work as expected:
+        assert "${fqdn}" == machine.succeed("hostname --fqdn").strip()
+        assert "${optionalString (domain != null) domain}" == machine.succeed("dnsdomainname").strip()
+        assert (
+            "${hostName}"
+            == machine.succeed(
+                'hostnamectl status | grep "Static hostname" | cut -d: -f2'
+            ).strip()
+        )
+
+        # 127.0.0.1 and ::1 should resolve back to "localhost":
+        assert (
+            "localhost" == machine.succeed("getent hosts 127.0.0.1 | awk '{print $2}'").strip()
+        )
+        assert "localhost" == machine.succeed("getent hosts ::1 | awk '{print $2}'").strip()
+
+        # 127.0.0.2 should resolve back to the FQDN and hostname:
+        fqdn_and_host_name = "${optionalString (domain != null) "${hostName}.${domain} "}${hostName}"
+        assert (
+            fqdn_and_host_name
+            == machine.succeed("getent hosts 127.0.0.2 | awk '{print $2,$3}'").strip()
+        )
+      '';
+    };
+
 in
 {
  noExplicitDomain = makeHostNameTest "ahost" null null;
--- a/third_party/nixpkgs/nixos/tests/pantheon.nix
+++ b/third_party/nixpkgs/nixos/tests/pantheon.nix
@ -15,6 +15,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
    services.xserver.enable = true;
    services.xserver.desktopManager.pantheon.enable = true;

+    environment.systemPackages = [ pkgs.xdotool ];
  };

  enableOCR = true;
@ -29,6 +30,10 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
        machine.wait_for_text("${user.description}")
        # OCR was struggling with this one.
        # machine.wait_for_text("${bob.description}")
+        # Ensure the password box is focused by clicking it.
+        # Workaround for https://github.com/NixOS/nixpkgs/issues/211366.
+        machine.succeed("XAUTHORITY=/var/lib/lightdm/.Xauthority DISPLAY=:0 xdotool mousemove 512 505 click 1")
+        machine.sleep(2)
        machine.screenshot("elementary_greeter_lightdm")

    with subtest("Login with elementary-greeter"):
--- a/third_party/nixpkgs/nixos/tests/systemd-initrd-simple.nix
+++ b/third_party/nixpkgs/nixos/tests/systemd-initrd-simple.nix
@ -6,9 +6,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
      enable = true;
      emergencyAccess = true;
    };
-    fileSystems = lib.mkVMOverride {
-      "/".autoResize = true;
-    };
+    virtualisation.fileSystems."/".autoResize = true;
  };

  testScript = ''
--- a/third_party/nixpkgs/nixos/tests/wireguard/namespaces.nix
+++ b/third_party/nixpkgs/nixos/tests/wireguard/namespaces.nix
@ -39,6 +39,7 @@ import ../make-test-python.nix ({ pkgs, lib, kernelPackages ? null, ... } : {
        preSetup = ''
          ip netns add ${interfaceNamespace}
        '';
+        mtu = 1280;
        inherit interfaceNamespace;
      };
    };
--- a/third_party/nixpkgs/pkgs/applications/audio/audacious/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/audacious/default.nix
@ -12,11 +12,11 @@

 stdenv.mkDerivation rec {
  pname = "audacious";
-  version = "4.2";
+  version = "4.3";

  src = fetchurl {
    url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
-    sha256 = "sha256-/rME5HCkgf4rPEyhycs7I+wmJUDBLQ0ebCKl62JeBLM=";
+    sha256 = "sha256-J1hNyEXH5w24ySZ5kJRfFzIqHsyA/4tFLpypFqDOkJE=";
  };

  nativeBuildInputs = [
--- a/third_party/nixpkgs/pkgs/applications/audio/audacious/plugins.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/audacious/plugins.nix
@ -35,6 +35,8 @@
 , neon
 , ninja
 , pkg-config
+, opusfile
+, pipewire
 , qtbase
 , qtmultimedia
 , qtx11extras
@ -44,11 +46,11 @@

 stdenv.mkDerivation rec {
  pname = "audacious-plugins";
-  version = "4.2";
+  version = "4.3";

  src = fetchurl {
    url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
-    sha256 = "sha256-b6D2nDoQQeuHfDcQlROrSioKVqd9nowToVgc8UOaQX8=";
+    sha256 = "sha256-Zi72yMS9cNDzX9HF8IuRVJuUNmOLZfihozlWsJ34n8Y=";
  };

  patches = [ ./0001-Set-plugindir-to-PREFIX-lib-audacious.patch ];
@ -91,6 +93,8 @@ stdenv.mkDerivation rec {
    lirc
    mpg123
    neon
+    opusfile
+    pipewire
    qtbase
    qtmultimedia
    qtx11extras
--- a/third_party/nixpkgs/pkgs/applications/audio/cplay-ng/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/cplay-ng/default.nix
@ -8,13 +8,13 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "cplay-ng";
-  version = "5.1.0";
+  version = "5.2.0";

  src = fetchFromGitHub {
    owner = "xi";
    repo = "cplay-ng";
    rev = version;
-    hash = "sha256-pmuZ1NgrQKEJLoJEVC9wp5deFWc6DiX5DpnISeOOw4k=";
+    hash = "sha256-M9WpB59AWSaGMnGrO37Fc+7O6pVBc2BDAv/BGlPmo8E=";
  };

  nativeBuildInputs = [
--- a/third_party/nixpkgs/pkgs/applications/audio/freac/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/freac/default.nix
@ -9,13 +9,13 @@

 stdenv.mkDerivation rec {
  pname = "freac";
-  version = "1.1.6";
+  version = "1.1.7";

  src = fetchFromGitHub {
    owner = "enzo1982";
    repo = "freac";
    rev = "v${version}";
-    sha256 = "sha256-PDFc/RhxIe6M3lfVHE1QmJnu5Sy+q/yrXrXPV/8X51o=";
+    sha256 = "sha256-bHoRxxhSM7ipRkiBG7hEa1Iw8Z3tOHQ/atngC/3X1a4=";
  };

  buildInputs = [
--- a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix
@ -13,13 +13,13 @@

 stdenv.mkDerivation rec {
  pname = "ft2-clone";
-  version = "1.63";
+  version = "1.65";

  src = fetchFromGitHub {
    owner = "8bitbubsy";
    repo = "ft2-clone";
    rev = "v${version}";
-    sha256 = "sha256-uDAW97lTeL15PPpR5vlIS371EZ7BBNd86ETPEB8joSU=";
+    sha256 = "sha256-Jo1qs0d8/o9FWR7jboWCJ7ntawBGTlm7yPzxxUnZLsI=";
  };

  # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh)
--- a/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix
@ -10,13 +10,13 @@
 # gcc only supports objc on darwin
 buildGoModule.override { stdenv = clangStdenv; } rec {
  pname = "go-musicfox";
-  version = "3.7.0";
+  version = "3.7.2";

  src = fetchFromGitHub {
    owner = "anhoder";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-IXB5eOXVtoe21WbQa9x5SKcgUpgyjVx48998vdccMPM=";
+    hash = "sha256-Wc9HFvBSLQA7jT+LJj+tyHzRbszhR2XD1/3C+SdrAGA=";
  };

  deleteVendor = true;
--- a/third_party/nixpkgs/pkgs/applications/audio/linvstmanager/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/linvstmanager/default.nix
@ -0,0 +1,36 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, qtbase
+, wrapQtAppsHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "linvstmanager";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "Goli4thus";
+    repo = "linvstmanager";
+    rev = "v${version}";
+    hash = "sha256-K6eugimMy/MZgHYkg+zfF8DDqUuqqoeymxHtcFGu2Uk=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    qtbase
+  ];
+
+  meta = with lib; {
+    description = "Graphical companion application for various bridges like LinVst, etc";
+    homepage = "https://github.com/Goli4thus/linvstmanager";
+    license = with licenses; [ gpl3 ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.GabrielDougherty ];
+  };
+}
--- a/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix
@ -1,33 +1,30 @@
-{lib, gcc10Stdenv, fetchurl}:
+{ lib
+, stdenv
+, fetchzip
+, cmake
+}:

-gcc10Stdenv.mkDerivation rec {
-  version = "3.99-u4-b5";
-  pname = "monkeys-audio-old";
+stdenv.mkDerivation rec {
+  version = "9.20";
+  pname = "monkeys-audio";

-  patches = [ ./buildfix.diff ];
-
-  src = fetchurl {
-    /*
-    The real homepage is <https://monkeysaudio.com/>, but in fact we are
-    getting an old, ported to Linux version of the sources, made by (quoting
-    from the AUTHORS file found in the source):
-
-    Frank Klemm : First port to linux (with makefile)
-
-    SuperMMX <SuperMMX AT GMail DOT com> : Package the source, include the frontend and shared lib,
-         porting to Big Endian platform and adding other non-win32 enhancement.
-    */
-    url = "https://deb-multimedia.org/pool/main/m/${pname}/${pname}_${version}.orig.tar.gz";
-    sha256 = "0kjfwzfxfx7f958b2b1kf8yj655lp0ppmn0sh57gbkjvj8lml7nz";
+  src = fetchzip {
+    url = "https://monkeysaudio.com/files/MAC_${
+      builtins.concatStringsSep "" (lib.strings.splitString "." version)}_SDK.zip";
+    sha256 = "sha256-8cJ88plR9jrrLdzRHzRotGBrn6qIqOWvl+oOTXxY/TE=";
+    stripRoot = false;
  };
+  nativeBuildInputs = [
+    cmake
+  ];

  meta = with lib; {
-    description = "Lossless audio codec";
+    description = "APE codec and decompressor";
    platforms = platforms.linux;
    # This is not considered a GPL license, but it seems rather free although
    # it's not standard, see a quote of it:
    # https://github.com/NixOS/nixpkgs/pull/171682#issuecomment-1120260551
    license = licenses.free;
-    maintainers = [ ];
+    maintainers = with maintainers; [ doronbehar ];
  };
 }
--- a/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix
@ -1,23 +1,25 @@
 { lib, fetchFromGitHub
+, pkg-config, meson ,ninja
 , python3Packages
 , gdk-pixbuf, glib, gobject-introspection, gtk3
 , libnotify
-, intltool
 , wrapGAppsHook }:

 python3Packages.buildPythonApplication rec {
  pname = "mpdevil";
-  version = "1.4.1";
+  version = "1.10.1";

  src = fetchFromGitHub {
    owner = "SoongNoonien";
    repo = pname;
    rev = "v${version}";
-    sha256 = "1a5nhlbgi3ahnkcq16c2vgiaghgswy5lxg64pcrlbqssg1pj5gma";
+    sha256 = "sha256-w31e8cJvdep/ZzmDBCfdCZotrPunQBl1cTTWjs3sE1w=";
  };

+  format = "other";
+
  nativeBuildInputs = [
-    glib.dev gobject-introspection gtk3 intltool wrapGAppsHook
+    glib.dev gobject-introspection gtk3 pkg-config meson ninja wrapGAppsHook
  ];

  buildInputs = [
--- a/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix
@ -11,17 +11,18 @@
 , pcre2
 , gzip
 , perl
+, jq
 }:

 stdenv.mkDerivation rec {
  pname = "mympd";
-  version = "9.5.4";
+  version = "10.2.4";

  src = fetchFromGitHub {
    owner = "jcorporation";
    repo = "myMPD";
    rev = "v${version}";
-    sha256 = "sha256-0X/rEVfJ6zzX75R72xVntOfuCt8srp9PkiYOq3XbWPs=";
+    sha256 = "sha256-12hCIAwrLQkwiU9t9nNPBdIiHfMidfErSWOA0FPfhBQ=";
  };

  nativeBuildInputs = [
@ -29,6 +30,7 @@ stdenv.mkDerivation rec {
    cmake
    gzip
    perl
+    jq
  ];
  preConfigure = ''
    env MYMPD_BUILDDIR=$PWD/build ./build.sh createassets
--- a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "praat";
-  version = "6.3.08";
+  version = "6.3.09";

  src = fetchFromGitHub {
    owner = "praat";
    repo = "praat";
    rev = "v${version}";
-    sha256 = "sha256-65/RGUUuJDE2fvd3ltwdDR6rAWtQaRMIdlZzbh+/pfo=";
+    sha256 = "sha256-oidYxG3A0yZGAJzjf5WvspEIbh1d/SXNHJsxKsSRifI=";
  };

  configurePhase = ''
--- a/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix
@ -63,6 +63,7 @@ stdenv.mkDerivation rec {
    copyDesktopItems
    cmake
    pkg-config
+    ruby
    erlang
    elixir
    beamPackages.hex
@ -94,7 +95,6 @@ stdenv.mkDerivation rec {

  nativeCheckInputs = [
    parallel
-    ruby
    supercollider-with-sc3-plugins
    jack2
  ];
@ -216,6 +216,8 @@ stdenv.mkDerivation rec {
    })
  ];

+  passthru.updateScript = ./update.sh;
+
  meta = with lib; {
    homepage = "https://sonic-pi.net/";
    description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools";
--- a/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/update.sh
+++ b/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/update.sh
@ -0,0 +1,50 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nix jq common-updater-scripts
+
+set -euo pipefail
+
+nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))"
+
+stripwhitespace() {
+    sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//'
+}
+
+nixeval() {
+    nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1" | jq -r .
+}
+
+vendorhash() {
+    (nix --extra-experimental-features nix-command build --impure --argstr nixpkgs "$nixpkgs" --argstr attr "$1" --expr '{ nixpkgs, attr }: let pkgs = import nixpkgs {}; in with pkgs.lib; (getAttrFromPath (splitString "." attr) pkgs).overrideAttrs (attrs: { outputHash = fakeHash; })' --no-link 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true
+}
+
+findpath() {
+    path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)"
+    outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")"
+
+    if [ -n "$outpath" ]; then
+        path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}"
+    fi
+
+    echo "$path"
+}
+
+attr="${UPDATE_NIX_ATTR_PATH:-sonic-pi}"
+version="$(cd "$nixpkgs" && list-git-tags --pname="$(nixeval "$attr".pname)" --attr-path="$attr" | grep '^v' | sed -e 's|^v||' | sort -V | tail -n1)"
+
+pkgpath="$(findpath "$attr")"
+
+updated="$(cd "$nixpkgs" && update-source-version "$attr" "$version" --file="$pkgpath" --print-changes | jq -r length)"
+
+if [ "$updated" -eq 0 ]; then
+    echo 'update.sh: Package version not updated, nothing to do.'
+    exit 0
+fi
+
+curhash="$(nixeval "$attr.mixFodDeps.outputHash")"
+newhash="$(vendorhash "$attr.mixFodDeps")"
+
+if [ -n "$newhash" ] && [ "$curhash" != "$newhash" ]; then
+    sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath"
+else
+    echo 'update.sh: New vendorHash same as old vendorHash, nothing to do.'
+fi
--- a/third_party/nixpkgs/pkgs/applications/blockchains/chia-dev-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/chia-dev-tools/default.nix
@ -7,13 +7,13 @@
 }:
 python3Packages.buildPythonApplication rec {
  pname = "chia-dev-tools";
-  version = "1.1.4";
+  version = "1.1.5";

  src = fetchFromGitHub {
    owner = "Chia-Network";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-lE7FTSDqVS6AstcxZSMdQwgygMvcvh1fqYVTTSSNZpA=";
+    hash = "sha256-qWWLQ+SkoRu5cLytwwrslqsKORy+4ebO8brULEFGaF0=";
  };

  patches = [
--- a/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix
@ -22,11 +22,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "clightning";
-  version = "22.11.1";
+  version = "23.02";

  src = fetchurl {
    url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
-    sha256 = "sha256-F48jmG9voNp6+IMRVkJi6O0DXVQxKyYkOA0UBCKktIw=";
+    sha256 = "sha256-uvk7sApIwlrkH8eERBetf/nsAkN2d35T/IEtICFflzY=";
  };

  # when building on darwin we need dawin.cctools to provide the correct libtool
--- a/third_party/nixpkgs/pkgs/applications/blockchains/litecoin/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/litecoin/default.nix
@ -11,13 +11,13 @@

 mkDerivation rec {
  pname = "litecoin" + lib.optionalString (!withGui) "d";
-  version = "0.21.2.1";
+  version = "0.21.2.2";

  src = fetchFromGitHub {
    owner = "litecoin-project";
    repo = "litecoin";
    rev = "v${version}";
-    sha256 = "sha256-WJFdac5hGrHy9o3HzjS91zH+4EtJY7kUJAQK+aZaEyo=";
+    sha256 = "sha256-TuDc47TZOEQA5Lr4DQkEhnO/Szp9h71xPjaBL3jFWuM=";
  };

  nativeBuildInputs = [ pkg-config autoreconfHook ];
--- a/third_party/nixpkgs/pkgs/applications/blockchains/monero-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/monero-cli/default.nix
@ -6,16 +6,32 @@
 , trezorSupport ? true, libusb1, protobuf, python3
 }:

+let
+  # submodules
+  supercop = fetchFromGitHub {
+    owner = "monero-project";
+    repo = "supercop";
+    rev = "633500ad8c8759995049ccd022107d1fa8a1bbc9";
+    sha256 = "26UmESotSWnQ21VbAYEappLpkEMyl0jiuCaezRYd/sE=";
+  };
+  trezor-common = fetchFromGitHub {
+    owner = "trezor";
+    repo = "trezor-common";
+    rev = "bff7fdfe436c727982cc553bdfb29a9021b423b0";
+    sha256 = "VNypeEz9AV0ts8X3vINwYMOgO8VpNmyUPC4iY3OOuZI=";
+  };
+
+in
+
 stdenv.mkDerivation rec {
  pname = "monero-cli";
-  version = "0.18.1.2";
+  version = "0.18.2.0";

  src = fetchFromGitHub {
    owner = "monero-project";
    repo = "monero";
    rev = "v${version}";
-    sha256 = "sha256-yV1ysoesEcjL+JX6hkmcrBDmazOWBvYK6EjshxJzcAw=";
-    fetchSubmodules = true;
+    sha256 = "n2e5U3p0eG2atPYV86H2UAURwsIkeSOBm8iwYsDVAoc=";
  };

  patches = [
@ -23,8 +39,10 @@ stdenv.mkDerivation rec {
  ];

  postPatch = ''
-    # remove vendored libraries
-    rm -r external/{miniupnp,randomx,rapidjson}
+    # manually install submodules
+    rmdir external/{supercop,trezor-common}
+    ln -sf ${supercop} external/supercop
+    ln -sf ${trezor-common} external/trezor-common
    # export patched source for monero-gui
    cp -r . $source
  '';
--- a/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix
@ -14,13 +14,13 @@

 stdenv.mkDerivation rec {
  pname = "monero-gui";
-  version = "0.18.1.2";
+  version = "0.18.2.0";

  src = fetchFromGitHub {
    owner = "monero-project";
    repo = "monero-gui";
    rev = "v${version}";
-    sha256 = "sha256-GBILqNkYQUkil1qvYnJTkHwgK3dzKR9I9GVbbLy/0UU=";
+    sha256 = "Bm6OpK1jjdWVqdp6HpirqP6+3GcMSZfZ/e70wcu+rQc=";
  };

  nativeBuildInputs = [
--- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix
@ -12,13 +12,13 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "polkadot";
-  version = "0.9.38";
+  version = "0.9.39";

  src = fetchFromGitHub {
    owner = "paritytech";
    repo = "polkadot";
    rev = "v${version}";
-    hash = "sha256-qS9LZ9KBjOw7hEkUzu7eZFj6ZwbkCDxoqA7FPXb13o4=";
+    hash = "sha256-ewjab9BtItJWtadEZO1PH5+2fOAafNof+2uVm8e78V4=";

    # the build process of polkadot requires a .git folder in order to determine
    # the git commit hash that is being built and add it to the version string.
@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
    '';
  };

-  cargoHash = "sha256-4BOgG/NzSppTeEtoEVxqlYjV4FGkNFMeF+qCJwPz+7o=";
+  cargoHash = "sha256-KqdUh+ES9UB01yrmNVXdiyYZPh9pjJOEjcuwlJr6Jxc=";

  buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];

--- a/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix
@ -3,13 +3,13 @@

 stdenv.mkDerivation rec {
  pname = "stellar-core";
-  version = "19.7.0";
+  version = "19.8.0";

  src = fetchFromGitHub {
    owner = "stellar";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-VfaP4EIVsu5JTAV7AX0Ymo44/TD8eUB61CViwf6Hfqw=";
+    sha256 = "sha256-OaJztBOl5rDiCq+s1sXwuX+Yh+LSJtcnGIQeuMANLdU=";
    fetchSubmodules = true;
  };

--- a/third_party/nixpkgs/pkgs/applications/blockchains/torq/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/torq/default.nix
@ -6,20 +6,20 @@

 let
  pname = "torq";
-  version = "0.18.17";
+  version = "0.18.19";

  src = fetchFromGitHub {
    owner = "lncapital";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-xiA66yGo8b1+zZ7jQ7SFOtNPmqbdna7fUCT21uibrIM=";
+    hash = "sha256-qJIAH8SrB5a7j6ptorEm6fryZj63vDQIUQIgRsVn1us=";
  };

  web = buildNpmPackage {
    pname = "${pname}-frontend";
    inherit version;
    src = "${src}/web";
-    npmDepsHash = "sha256-/7x5RWYIB5BChYMnMuFVVaZd0pVkew4i4QrF7hSFnCM=";
+    npmDepsHash = "sha256-WulYJE2pdVa5hquV/7UjR1z9PkglJXOq5fv8nLa4wos=";

    # copied from upstream Dockerfile
    npmInstallFlags = [ "--legacy-peer-deps" ];
--- a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/regreet.nix
+++ b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/regreet.nix
@ -0,0 +1,35 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, glib
+, gtk4
+, pango
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "regreet";
+  version = "unstable-2023-02-27";
+
+  src = fetchFromGitHub {
+    owner = "rharish101";
+    repo = "ReGreet";
+    rev = "2bbabe90f112b4feeb0aea516c265daaec8ccf2a";
+    hash = "sha256-71ji4x/NUE4qmBuO5PkWTPE1a0uPXqJSwW1Ai1amPJE=";
+  };
+
+  cargoHash = "sha256-rz2eMMhoMtzBXCH6ZJOvGuYLeHSWga+Ebc4+ZO8Kk1g=";
+
+  buildFeatures = [ "gtk4_8" ];
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ glib gtk4 pango ];
+
+  meta = with lib; {
+    description = "Clean and customizable greeter for greetd";
+    homepage = "https://github.com/rharish101/ReGreet";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ fufexan ];
+    platforms = platforms.linux;
+  };
+}
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
@ -366,6 +366,21 @@
          license = lib.licenses.free;
        };
      }) {};
+    beframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "beframe";
+        ename = "beframe";
+        version = "0.1.11";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/beframe-0.1.11.tar";
+          sha256 = "1r5wlg2xaih197fi3jk0qmnhpy7mc6xrwraxfnygsjwr63dxhnq2";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/beframe.html";
+          license = lib.licenses.free;
+        };
+      }) {};
    bind-key = callPackage ({ elpaBuild, fetchurl, lib }:
      elpaBuild {
        pname = "bind-key";
@ -1659,16 +1674,16 @@
          license = lib.licenses.free;
        };
      }) {};
-    erc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+    erc = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
      elpaBuild {
        pname = "erc";
        ename = "erc";
-        version = "5.4.1";
+        version = "5.5";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/erc-5.4.1.tar";
-          sha256 = "0hghqwqrx11f8qa1zhyhjqp99w01l686azsmd24z9w0l93fz598a";
+          url = "https://elpa.gnu.org/packages/erc-5.5.tar";
+          sha256 = "02649ijnpyalk0k1yq1dcinj92awhbnkia2x9sdb9xjk80xw1gqp";
        };
-        packageRequires = [ emacs ];
+        packageRequires = [ compat emacs ];
        meta = {
          homepage = "https://elpa.gnu.org/packages/erc.html";
          license = lib.licenses.free;
@ -2612,10 +2627,10 @@
      elpaBuild {
        pname = "kind-icon";
        ename = "kind-icon";
-        version = "0.1.9";
+        version = "0.2.0";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/kind-icon-0.1.9.tar";
-          sha256 = "0phssrcpmcidzlwy1577f3f02qwjs6hpavb416302y0n8kkhwvli";
+          url = "https://elpa.gnu.org/packages/kind-icon-0.2.0.tar";
+          sha256 = "1vgwbd99vx793iy04albkxl24c7vq598s7bg0raqwmgx84abww6r";
        };
        packageRequires = [ emacs svg-lib ];
        meta = {
@ -3047,10 +3062,10 @@
      elpaBuild {
        pname = "modus-themes";
        ename = "modus-themes";
-        version = "3.0.0";
+        version = "4.1.1";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/modus-themes-3.0.0.tar";
-          sha256 = "1c3rls175nmc4n01hfzwqxv2nhyv8n6i8d4pv93k28z6c30n8lhs";
+          url = "https://elpa.gnu.org/packages/modus-themes-4.1.1.tar";
+          sha256 = "06lp7mpazby7iiwzw4naym983plg9r63ba9vmaszh3609d2gm0s9";
        };
        packageRequires = [ emacs ];
        meta = {
@ -3731,10 +3746,10 @@
      elpaBuild {
        pname = "phps-mode";
        ename = "phps-mode";
-        version = "0.4.39";
+        version = "0.4.42";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/phps-mode-0.4.39.tar";
-          sha256 = "0wixalji4c4hjqb41n1yvxfy3qfl2ipfsjawbgk9wdwb7jkhjr1i";
+          url = "https://elpa.gnu.org/packages/phps-mode-0.4.42.tar";
+          sha256 = "040wrmz9wl0x86vdgzyfdwxdciscd94v9nfgfz0ir2ghwhw6j9x3";
        };
        packageRequires = [ emacs ];
        meta = {
@ -3821,10 +3836,10 @@
      elpaBuild {
        pname = "posframe";
        ename = "posframe";
-        version = "1.3.3";
+        version = "1.4.0";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/posframe-1.3.3.tar";
-          sha256 = "07hgbhvhwj6zfhlg6znavwrj3gp7cv4c758chrhkvk33a3slhw6b";
+          url = "https://elpa.gnu.org/packages/posframe-1.4.0.tar";
+          sha256 = "0pqy7scdi3qxj518xm0bbr3979byfxqxxh64wny37xzhd4apsw5j";
        };
        packageRequires = [ emacs ];
        meta = {
@ -4422,10 +4437,10 @@
      elpaBuild {
        pname = "shell-command-plus";
        ename = "shell-command+";
-        version = "2.4.1";
+        version = "2.4.2";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/shell-command+-2.4.1.tar";
-          sha256 = "1pbv5g58647gq83vn5pg8c6kjhvjn3lj0wggz3iz3695yvl8aw4i";
+          url = "https://elpa.gnu.org/packages/shell-command+-2.4.2.tar";
+          sha256 = "1ldvil6hjs8c7wpdwx0jwaar867dil5qh6vy2k27i1alffr9nnqm";
        };
        packageRequires = [ emacs ];
        meta = {
@ -4896,10 +4911,10 @@
      elpaBuild {
        pname = "taxy-magit-section";
        ename = "taxy-magit-section";
-        version = "0.12.1";
+        version = "0.12.2";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/taxy-magit-section-0.12.1.tar";
-          sha256 = "0bs00y8pl51dji23zx5w64h6la0y109q0jv2q1nggizk6q5bsxmg";
+          url = "https://elpa.gnu.org/packages/taxy-magit-section-0.12.2.tar";
+          sha256 = "1pf83zz5ibhqqlqgcxig0dsl1rnkk5r6v16s5ngvbc37q40vkwn1";
        };
        packageRequires = [ emacs magit-section taxy ];
        meta = {
@ -5035,10 +5050,10 @@
      elpaBuild {
        pname = "tramp";
        ename = "tramp";
-        version = "2.6.0.1";
+        version = "2.6.0.2";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tramp-2.6.0.1.tar";
-          sha256 = "1mxkl8v40wdcyvsyjayw9yj7ghn5zrnzgaapwh1prxs42scw85x8";
+          url = "https://elpa.gnu.org/packages/tramp-2.6.0.2.tar";
+          sha256 = "0pfrsgci1rqrykkfyxm9wsn7f0l3rzc2vj1fas27w925l0k0lrci";
        };
        packageRequires = [ emacs ];
        meta = {
@ -5140,10 +5155,10 @@
      elpaBuild {
        pname = "triples";
        ename = "triples";
-        version = "0.2.3";
+        version = "0.2.6";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/triples-0.2.3.tar";
-          sha256 = "1p6vijaab3a7h9lqlxxhyipwd9rkr15r3rm0iyxxanlcggi04a39";
+          url = "https://elpa.gnu.org/packages/triples-0.2.6.tar";
+          sha256 = "09vr8r78vpycpxglacbgy2fy01khmvhh42panilwz2n9nhjy6xzm";
        };
        packageRequires = [ emacs seq ];
        meta = {
@ -5411,10 +5426,10 @@
      elpaBuild {
        pname = "vertico-posframe";
        ename = "vertico-posframe";
-        version = "0.7.1";
+        version = "0.7.2";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.1.tar";
-          sha256 = "18a65hnacavy375ry5qmfj454b10h2yg9p6wbx1wdx30fwpi247a";
+          url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.2.tar";
+          sha256 = "1sbgg0syyk24phwzji40lyw5dmwxssgvwv2fs8mbmkhv0q44f9ny";
        };
        packageRequires = [ emacs posframe vertico ];
        meta = {
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@ -1,13 +1,14 @@
 { lib, pkgs }:

-self: with self; {
-
+self:
+let
+  inherit (self) callPackage;
+in
+{
  agda-input = callPackage ./manual-packages/agda-input { };

  agda2-mode = callPackage ./manual-packages/agda2-mode { };

-  bqn-mode = callPackage ./manual-packages/bqn-mode { };
-
  cask = callPackage ./manual-packages/cask { };

  control-lock = callPackage ./manual-packages/control-lock { };
@ -86,8 +87,8 @@ self: with self; {
  sunrise-commander = callPackage ./manual-packages/sunrise-commander { };

  # camelCase aliases for some of the kebab-case expressions above
-  colorThemeSolarized = color-theme-solarized;
-  emacsSessionManagement = session-management-for-emacs;
-  rectMark = rect-mark;
-  sunriseCommander = sunrise-commander;
+  colorThemeSolarized = self.color-theme-solarized;
+  emacsSessionManagement = self.session-management-for-emacs;
+  rectMark = self.rect-mark;
+  sunriseCommander = self.sunrise-commander;
 }
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/bqn-mode/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/bqn-mode/default.nix
@ -1,22 +0,0 @@
-{ lib
-, trivialBuild
-, fetchFromGitHub
-}:
-
-trivialBuild {
-  pname = "bqn-mode";
-  version = "0.pre+date=2022-09-14";
-
-  src = fetchFromGitHub {
-    owner = "museoa";
-    repo = "bqn-mode";
-    rev = "3e3d4758c0054b35f047bf6d9e03b1bea425d013";
-    hash = "sha256:0pz3m4jp4dn8bsmc9n51sxwdk6g52mxb6y6f6a4g4hggb35shy2a";
-  };
-
-  meta = with lib; {
-    description = "Emacs mode for BQN programming language";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ sternenseemann AndersonTorres ];
-  };
-}
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@ -425,6 +425,18 @@ let

        rtags-xref = dontConfigure super.rtags;

+        rime = super.rime.overrideAttrs (old: {
+          buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.librime ];
+          preBuild = (old.preBuild or "") + ''
+            make lib
+            mkdir -p /build/rime-lib
+            cp *.so /build/rime-lib
+          '';
+          postInstall = (old.postInstall or "") + ''
+            install -m444 -t $out/share/emacs/site-lisp/elpa/rime-* /build/rime-lib/*.so
+          '';
+        });
+
        shm = super.shm.overrideAttrs (attrs: {
          propagatedUserEnvPkgs = [ pkgs.haskellPackages.structured-haskell-mode ];
        });
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
@ -3182,10 +3182,10 @@
      elpaBuild {
        pname = "xah-fly-keys";
        ename = "xah-fly-keys";
-        version = "22.9.20230207171612";
+        version = "22.12.20230301220803";
        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-22.9.20230207171612.tar";
-          sha256 = "0m633k8rx2k3gwbh3hndkmn3k804pg7j7xmqw6yf8j2a2ym4893b";
+          url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-22.12.20230301220803.tar";
+          sha256 = "0m1wyhxqsih7777hchjk4v742ar16frdjvxyspa72az881yinv5g";
        };
        packageRequires = [ emacs ];
        meta = {
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@ -91,6 +91,17 @@
    };
    meta.homepage = "https://github.com/latex-lsp/tree-sitter-bibtex";
  };
+  bicep = buildGrammar {
+    language = "bicep";
+    version = "b94a098";
+    src = fetchFromGitHub {
+      owner = "amaanq";
+      repo = "tree-sitter-bicep";
+      rev = "b94a0983b69ebb75e9129329a188199ad6ebcec0";
+      hash = "sha256-YCVOgLmtCWd4FwfwmQUZhSzP2wS2ZDLwXP1BRrpE0Ls=";
+    };
+    meta.homepage = "https://github.com/amaanq/tree-sitter-bicep";
+  };
  blueprint = buildGrammar {
    language = "blueprint";
    version = "6ef91ca";
@ -104,34 +115,34 @@
  };
  c = buildGrammar {
    language = "c";
-    version = "7175a6d";
+    version = "f357890";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-c";
-      rev = "7175a6dd5fc1cee660dce6fe23f6043d75af424a";
-      hash = "sha256-G9kVqX8walvpI7gPvPzS8g7X8RVM9y5wJHGOcyjJA/A=";
+      rev = "f35789006ccbe5be8db21d1a2dd4cc0b5a1286f2";
+      hash = "sha256-TLaqolQEN3m3YuNo8JbuRyaEmbWQCWyJJUaDDv4GFDY=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-c";
  };
  c_sharp = buildGrammar {
    language = "c_sharp";
-    version = "5b6c4d0";
+    version = "fcacbeb";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-c-sharp";
-      rev = "5b6c4d0d19d79b05c69ad752e11829910e3b4610";
-      hash = "sha256-Ax9AuxqQK9gSlkxM2k6E32CskudUmduWm0luC031P5U=";
+      rev = "fcacbeb4af6bcdcfb4527978a997bb03f4fe086d";
+      hash = "sha256-sMNNnp1Ypljou0RZ9V0M4qVP/2Osrk1L8NCiyEGY1pw=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
  };
  capnp = buildGrammar {
    language = "capnp";
-    version = "cb85cdd";
+    version = "fc6e2ad";
    src = fetchFromGitHub {
      owner = "amaanq";
      repo = "tree-sitter-capnp";
-      rev = "cb85cddfdf398530110c807ba046822dbaee6afb";
-      hash = "sha256-VB8fNF8EtTAkKBLIAByazczPHJYdBULCeoGQ1ZLLRhI=";
+      rev = "fc6e2addf103861b9b3dffb82c543eb6b71061aa";
+      hash = "sha256-FKzh0c/mTURLss8mv/c/p3dNXQxE/r5P063GEM8un70=";
    };
    meta.homepage = "https://github.com/amaanq/tree-sitter-capnp";
  };
@ -148,12 +159,12 @@
  };
  clojure = buildGrammar {
    language = "clojure";
-    version = "262d6d6";
+    version = "421546c";
    src = fetchFromGitHub {
      owner = "sogaiu";
      repo = "tree-sitter-clojure";
-      rev = "262d6d60f39f0f77b3dd08da8ec895bd5a044416";
-      hash = "sha256-9+tMkv329FfxYzALxkr6QZBEmJJBKUDBK4RzIsNL7S0=";
+      rev = "421546c2547c74d1d9a0d8c296c412071d37e7ca";
+      hash = "sha256-GfDaUZjvTELXkRzJXK303QyPDQr7ozfrz/4iOQNDQTU=";
    };
    meta.homepage = "https://github.com/sogaiu/tree-sitter-clojure";
  };
@ -201,14 +212,25 @@
    };
    meta.homepage = "https://github.com/addcninblue/tree-sitter-cooklang";
  };
+  cpon = buildGrammar {
+    language = "cpon";
+    version = "eedb93b";
+    src = fetchFromGitHub {
+      owner = "amaanq";
+      repo = "tree-sitter-cpon";
+      rev = "eedb93bf9e22e82ed6a67e6c57fd78731b44f591";
+      hash = "sha256-8x+oUbiwt7prGc5cli5HabHoH3q/mBnQzO1Wy2Bauac=";
+    };
+    meta.homepage = "https://github.com/amaanq/tree-sitter-cpon";
+  };
  cpp = buildGrammar {
    language = "cpp";
-    version = "56cec4c";
+    version = "03fa93d";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-cpp";
-      rev = "56cec4c2eb5d6af3d2942e69e35db15ae2433740";
-      hash = "sha256-CWh5p0tlBQizABjwBRN1VoxeEriOPhTy3lFZI9PjsTA=";
+      rev = "03fa93db133d6048a77d4de154a7b17ea8b9d076";
+      hash = "sha256-0KYGEgAWmKFialuCy2zTfadDYezaftRRWjnr7sua9/c=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
  };
@ -225,15 +247,26 @@
  };
  cuda = buildGrammar {
    language = "cuda";
-    version = "a02c214";
+    version = "91c3ca3";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-cuda";
-      rev = "a02c21408c592e6e6856eaabe4727faa97cf8d85";
-      hash = "sha256-bgyisXPNZXlvPF0nRPD5LeVhvbTx0TLgnToue9IFHwI=";
+      rev = "91c3ca3e42326e0f7b83c82765940bbf7f91c847";
+      hash = "sha256-0jDO8Wkqkn9ol4mfga/h/9yMMWkMF9Z/33rTxB8n1dg=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
  };
+  cue = buildGrammar {
+    language = "cue";
+    version = "4ffcda8";
+    src = fetchFromGitHub {
+      owner = "eonpatapon";
+      repo = "tree-sitter-cue";
+      rev = "4ffcda8c2bdfee1c2ba786cd503d0508ea92cca2";
+      hash = "sha256-a72Z67LXmEuHF/mKIaxi1Y9TNzqLjAiPYR3+VUu9fso=";
+    };
+    meta.homepage = "https://github.com/eonpatapon/tree-sitter-cue";
+  };
  d = buildGrammar {
    language = "d";
    version = "c2fbf21";
@ -269,6 +302,17 @@
    generate = true;
    meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree";
  };
+  dhall = buildGrammar {
+    language = "dhall";
+    version = "affb6ee";
+    src = fetchFromGitHub {
+      owner = "jbellerb";
+      repo = "tree-sitter-dhall";
+      rev = "affb6ee38d629c9296749767ab832d69bb0d9ea8";
+      hash = "sha256-q9OkKmp0Nor+YkFc8pBVAOoXoWzwjjzg9lBUKAUnjmQ=";
+    };
+    meta.homepage = "https://github.com/jbellerb/tree-sitter-dhall";
+  };
  diff = buildGrammar {
    language = "diff";
    version = "f69bde8";
@ -382,12 +426,12 @@
  };
  erlang = buildGrammar {
    language = "erlang";
-    version = "2422bc9";
+    version = "9fe5cdf";
    src = fetchFromGitHub {
      owner = "WhatsApp";
      repo = "tree-sitter-erlang";
-      rev = "2422bc9373094bfa97653ac540e08759f812523c";
-      hash = "sha256-DTIA3EP2RQtts6Hl6FThSxN1SwEUbRVJJig8zOUQRCo=";
+      rev = "9fe5cdfab0f0d753112e9949a3501f64b75a3d92";
+      hash = "sha256-nJikCiksuOAEXEvX2eQ2jZoVmzPQLJ36l4mk0irPW3c=";
    };
    meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang";
  };
@ -426,12 +470,12 @@
  };
  fortran = buildGrammar {
    language = "fortran";
-    version = "67cf1c9";
+    version = "31552ac";
    src = fetchFromGitHub {
      owner = "stadelmanma";
      repo = "tree-sitter-fortran";
-      rev = "67cf1c96fd0dd92edd7812a95626c86c9be0781a";
-      hash = "sha256-OImEGuPlks3XfWSWXLekz5nSPJUHNS9uDm6ugrFPfdQ=";
+      rev = "31552ac43ecaffa443a12ebea68cc526d334892f";
+      hash = "sha256-6ywdhlQGjivA2RV5345A0BiybAJOn9cIM03GMHjVoiM=";
    };
    meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
  };
@ -470,12 +514,12 @@
  };
  gdscript = buildGrammar {
    language = "gdscript";
-    version = "31ebb7c";
+    version = "a4b57cc";
    src = fetchFromGitHub {
      owner = "PrestonKnopp";
      repo = "tree-sitter-gdscript";
-      rev = "31ebb7cd0b880ea53a152eaf9d4df73f737181cc";
-      hash = "sha256-9fP6Us3mDMjJFM1Kxg0KiulCvyVv5qdo8+tyRgzGxUw=";
+      rev = "a4b57cc3bcbfc24550e858159647e9238e7ad1ac";
+      hash = "sha256-31FQlLVn5T/9858bPsZQkvejGVjO0ok5T5A13a+S91Y=";
    };
    meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript";
  };
@ -637,12 +681,12 @@
  };
  haskell = buildGrammar {
    language = "haskell";
-    version = "3bdba07";
+    version = "0da7f82";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-haskell";
-      rev = "3bdba07c7a8eec23f87fa59ce9eb2ea4823348b3";
-      hash = "sha256-/aGUdyVxXqXCvjruI8rqiKzfTsyxzOKaXSAUG5xK4cE=";
+      rev = "0da7f826e85b3e589e217adf69a6fd89ee4301b9";
+      hash = "sha256-5PCwcbF+UOmn4HE99RgBoDvC7w/QP1lo870+11S6cok=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell";
  };
@ -692,12 +736,12 @@
  };
  hlsl = buildGrammar {
    language = "hlsl";
-    version = "8e2f090";
+    version = "306d485";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-hlsl";
-      rev = "8e2f0907e8d2e17a88a375025e70054bafdaa8b0";
-      hash = "sha256-kBSigaBR6uM4E9uHI79gYlxBrN0E5i1zTW8syMPIQdI=";
+      rev = "306d48516a6b3dbb18a184692e8edffa8403018f";
+      hash = "sha256-PvraHZYbTF3FFIQoooRr1Lx4ZrBLzzxWd5YoqibBQfM=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
  };
@ -758,23 +802,23 @@
  };
  java = buildGrammar {
    language = "java";
-    version = "dd597f1";
+    version = "3c24aa9";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-java";
-      rev = "dd597f13eb9bab0c1bccc9aec390e8e6ebf9e0a6";
-      hash = "sha256-JeQZ4TMpt6Lfbcfc6m/PzhFZEgTdouasJ3b1sPISy2s=";
+      rev = "3c24aa9365985830421a3a7b6791b415961ea770";
+      hash = "sha256-06spTQhAIJvixfZ858vPKKv6FJ1AC4JElQzkugxfTuo=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-java";
  };
  javascript = buildGrammar {
    language = "javascript";
-    version = "15e85e8";
+    version = "5720b24";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-javascript";
-      rev = "15e85e80b851983fab6b12dce5a535f5a0df0f9c";
-      hash = "sha256-2SAJBnY8pmynGqB8OVqHeeAKovskO+C/XiJbLTKSlcM=";
+      rev = "5720b249490b3c17245ba772f6be4a43edb4e3b7";
+      hash = "sha256-rSkLSXdthOS9wzXsC8D1Z1P0vmOT+APzeesvlN7ta6U=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript";
  };
@ -857,12 +901,12 @@
  };
  kdl = buildGrammar {
    language = "kdl";
-    version = "c3c4856";
+    version = "e36f054";
    src = fetchFromGitHub {
      owner = "amaanq";
      repo = "tree-sitter-kdl";
-      rev = "c3c4856464842e05366b1f3ebc4434c9194cad43";
-      hash = "sha256-vYvyX9NWIFsWkxZvA5k32gFBh5Ykwgy0YrCBPAH6bcg=";
+      rev = "e36f054a60c4d9e5ae29567d439fdb8790b53b30";
+      hash = "sha256-ZZLe7WBDIX1x1lmuHE1lmZ93YWXTW3iwPgXXbxXR/n4=";
    };
    meta.homepage = "https://github.com/amaanq/tree-sitter-kdl";
  };
@ -890,12 +934,12 @@
  };
  latex = buildGrammar {
    language = "latex";
-    version = "6b7ea83";
+    version = "376f640";
    src = fetchFromGitHub {
      owner = "latex-lsp";
      repo = "tree-sitter-latex";
-      rev = "6b7ea839307670e6bda011f888717d3a882ecc09";
-      hash = "sha256-fmMm6HM9ZCnTyDxKmouoKFPYWkbrM//gHwVEFsICzUs=";
+      rev = "376f64097b7a26691a2ca60dc94e4dfa417be932";
+      hash = "sha256-9hcmCr9HfhKt5dkNN24haubrOySqpxzMoLVEGO53lxk=";
    };
    meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex";
  };
@ -932,6 +976,17 @@
    };
    meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua";
  };
+  luap = buildGrammar {
+    language = "luap";
+    version = "bfb38d2";
+    src = fetchFromGitHub {
+      owner = "amaanq";
+      repo = "tree-sitter-luap";
+      rev = "bfb38d254f380362e26b5c559a4086ba6e92ba77";
+      hash = "sha256-HpKqesIa+x3EQGnWV07jv2uEW9A9TEN4bPNuecXEaFI=";
+    };
+    meta.homepage = "https://github.com/amaanq/tree-sitter-luap";
+  };
  m68k = buildGrammar {
    language = "m68k";
    version = "d097b12";
@ -956,28 +1011,39 @@
  };
  markdown = buildGrammar {
    language = "markdown";
-    version = "7e7aa9a";
+    version = "fa6bfd5";
    src = fetchFromGitHub {
      owner = "MDeiml";
      repo = "tree-sitter-markdown";
-      rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979";
-      hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0=";
+      rev = "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d";
+      hash = "sha256-P31TiBW5JqDfYJhWH6pGqD2aWan0Bo1Tl0ONEg7ePnM=";
    };
    location = "tree-sitter-markdown";
    meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
  };
  markdown_inline = buildGrammar {
    language = "markdown_inline";
-    version = "7e7aa9a";
+    version = "fa6bfd5";
    src = fetchFromGitHub {
      owner = "MDeiml";
      repo = "tree-sitter-markdown";
-      rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979";
-      hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0=";
+      rev = "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d";
+      hash = "sha256-P31TiBW5JqDfYJhWH6pGqD2aWan0Bo1Tl0ONEg7ePnM=";
    };
    location = "tree-sitter-markdown-inline";
    meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
  };
+  matlab = buildGrammar {
+    language = "matlab";
+    version = "2d5d3d5";
+    src = fetchFromGitHub {
+      owner = "mstanciu552";
+      repo = "tree-sitter-matlab";
+      rev = "2d5d3d5193718a86477d4335aba5b34e79147326";
+      hash = "sha256-Rpa/F3MIFRmHunJFsuvbs3h3vDlR3U7UZ+sTN5tJS8U=";
+    };
+    meta.homepage = "https://github.com/mstanciu552/tree-sitter-matlab";
+  };
  menhir = buildGrammar {
    language = "menhir";
    version = "db7953a";
@ -1002,12 +1068,12 @@
  };
  meson = buildGrammar {
    language = "meson";
-    version = "5f3138d";
+    version = "3d6dfbd";
    src = fetchFromGitHub {
      owner = "Decodetalkers";
      repo = "tree-sitter-meson";
-      rev = "5f3138d555aceef976ec9a1d4a3f78e13b31e45f";
-      hash = "sha256-P0S2JpRjAznDLaU97NMzLuuNyPqqy4RNqBa+PKvyl6s=";
+      rev = "3d6dfbdb2432603bc84ca7dc009bb39ed9a8a7b1";
+      hash = "sha256-NRiecSr5UjISlFtmtvy3SYaWSmXMf0bKCKQVA83Jx+Y=";
    };
    meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson";
  };
@ -1113,14 +1179,25 @@
    };
    meta.homepage = "https://github.com/Isopod/tree-sitter-pascal.git";
  };
+  passwd = buildGrammar {
+    language = "passwd";
+    version = "2023939";
+    src = fetchFromGitHub {
+      owner = "ath3";
+      repo = "tree-sitter-passwd";
+      rev = "20239395eacdc2e0923a7e5683ad3605aee7b716";
+      hash = "sha256-3UfuyJeblQBKjqZvLYyO3GoCvYJp+DvBwQGkR3pFQQ4=";
+    };
+    meta.homepage = "https://github.com/ath3/tree-sitter-passwd";
+  };
  perl = buildGrammar {
    language = "perl";
-    version = "749d26f";
+    version = "ff1f0ac";
    src = fetchFromGitHub {
      owner = "ganezdragon";
      repo = "tree-sitter-perl";
-      rev = "749d26fe13fb131b92e6515416096e572575b981";
-      hash = "sha256-VOLvfgh1ZbuDk1BKBW9ln/9b/seudFv0PTIOFe1AtNE=";
+      rev = "ff1f0ac0f1c678a23f68d0140e75a0da8e11b7b5";
+      hash = "sha256-RFSDtd8iJJEX7dawMzaGwJUB4t/nr11hmG2EdTp11s4=";
    };
    meta.homepage = "https://github.com/ganezdragon/tree-sitter-perl";
  };
@ -1157,6 +1234,17 @@
    };
    meta.homepage = "https://github.com/leo60228/tree-sitter-pioasm";
  };
+  po = buildGrammar {
+    language = "po";
+    version = "d6aed22";
+    src = fetchFromGitHub {
+      owner = "erasin";
+      repo = "tree-sitter-po";
+      rev = "d6aed225290bc71a15ab6f06305cb11419360c56";
+      hash = "sha256-fz4DGPA+KtOvLBmVMXqwnEMeXhupFecQC1xfhMbWCJg=";
+    };
+    meta.homepage = "https://github.com/erasin/tree-sitter-po";
+  };
  poe_filter = buildGrammar {
    language = "poe_filter";
    version = "80dc101";
@ -1190,6 +1278,17 @@
    };
    meta.homepage = "https://github.com/mitchellh/tree-sitter-proto";
  };
+  prql = buildGrammar {
+    language = "prql";
+    version = "5f6c4e4";
+    src = fetchFromGitHub {
+      owner = "PRQL";
+      repo = "tree-sitter-prql";
+      rev = "5f6c4e4a90633b19e2077c1d37248989789d64be";
+      hash = "sha256-unmRen1XJgT60lMfsIsp0PBghfBGqMoiEN9nB8Hu6gQ=";
+    };
+    meta.homepage = "https://github.com/PRQL/tree-sitter-prql";
+  };
  pug = buildGrammar {
    language = "pug";
    version = "884e225";
@ -1203,12 +1302,12 @@
  };
  python = buildGrammar {
    language = "python";
-    version = "528855e";
+    version = "6282715";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-python";
-      rev = "528855eee2665210e1bf5556de48b8d8dacb8932";
-      hash = "sha256-H2RWMbbKIMbfH/TMC5SKbO9qEB9RfFUOYrczwmDdrVo=";
+      rev = "62827156d01c74dc1538266344e788da74536b8a";
+      hash = "sha256-hVtX4Dyqrq+cSvKTmKMxLbAplcCdR8dfFDoIZNtPFA0=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-python";
  };
@ -1223,6 +1322,17 @@
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-ql";
  };
+  qmldir = buildGrammar {
+    language = "qmldir";
+    version = "6b2b5e4";
+    src = fetchFromGitHub {
+      owner = "Decodetalkers";
+      repo = "tree-sitter-qmldir";
+      rev = "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841";
+      hash = "sha256-7ic9Xd+1G0JM25bY0f8N5r6YZx5NV5HrJXXHp6pXvo4=";
+    };
+    meta.homepage = "https://github.com/Decodetalkers/tree-sitter-qmldir";
+  };
  qmljs = buildGrammar {
    language = "qmljs";
    version = "ab75be9";
@ -1258,12 +1368,12 @@
  };
  racket = buildGrammar {
    language = "racket";
-    version = "1a5df02";
+    version = "c2f7baa";
    src = fetchFromGitHub {
      owner = "6cdh";
      repo = "tree-sitter-racket";
-      rev = "1a5df0206b25a05cb1b35a68d2105fc7493df39b";
-      hash = "sha256-cKRShvkpg6M8vxUvp5wKHvX9ZJOUyv7m2hNyfeKw/Bk=";
+      rev = "c2f7baa22053a66b4dba852cdba3f14f34bb6985";
+      hash = "sha256-P6p2IOECsqCLBgtLE+xqzZuMS8d/lTfAHfTeONClVbY=";
    };
    meta.homepage = "https://github.com/6cdh/tree-sitter-racket";
  };
@ -1346,12 +1456,12 @@
  };
  rust = buildGrammar {
    language = "rust";
-    version = "f7fb205";
+    version = "fbf9e50";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-rust";
-      rev = "f7fb205c424b0962de59b26b931fe484e1262b35";
-      hash = "sha256-Onk8i2vGHySsjg/O3OZvl7OlDpg3b5/7481f+jJMPCU=";
+      rev = "fbf9e507d09d8b3c0bb9dfc4d46c31039a47dc4a";
+      hash = "sha256-hWooQfE7sWXfOkGai3hREoEulcwWT6XPT4xAc+dfjKk=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust";
  };
@ -1401,12 +1511,12 @@
  };
  smali = buildGrammar {
    language = "smali";
-    version = "5a742af";
+    version = "a67a429";
    src = fetchFromSourcehut {
      owner = "~yotam";
      repo = "tree-sitter-smali";
-      rev = "5a742af7388864a3ff2ce8421328a33e7246a2d5";
-      hash = "sha256-8FpmeyGzaQDUWXs/XanNi1u0jHsKP9wq7y7XNaQIlXM=";
+      rev = "a67a429784dafa0ca4342d71e6530137ca803883";
+      hash = "sha256-Pby6RZKPXyPR41E9m2iRsLgVt7bOn2AZyyb4lvcwYwY=";
    };
    meta.homepage = "https://git.sr.ht/~yotam/tree-sitter-smali";
  };
@ -1423,14 +1533,14 @@
  };
  solidity = buildGrammar {
    language = "solidity";
-    version = "52ed088";
+    version = "1680203";
    src = fetchFromGitHub {
-      owner = "YongJieYongJie";
+      owner = "JoranHonig";
      repo = "tree-sitter-solidity";
-      rev = "52ed0880c0126df2f2c7693f215fe6f38e4a2e0a";
-      hash = "sha256-ZyeUYtE0pyQIPnZhza6u6yQO0Mx8brgAUmUpIXYZwb4=";
+      rev = "168020304759ad5d8b4a88a541a699134e3730c5";
+      hash = "sha256-GCSBXB9nNIYpcXlA6v7P1ejn1ojmfXdPzr1sWejB560=";
    };
-    meta.homepage = "https://github.com/YongJieYongJie/tree-sitter-solidity";
+    meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity";
  };
  sparql = buildGrammar {
    language = "sparql";
@ -1445,16 +1555,27 @@
  };
  sql = buildGrammar {
    language = "sql";
-    version = "3a3f92b";
+    version = "1cb7c7a";
    src = fetchFromGitHub {
      owner = "derekstride";
      repo = "tree-sitter-sql";
-      rev = "3a3f92b29c880488a08bc2baaf1aca6432ec3380";
-      hash = "sha256-UdvsZOpnZsfWomKHBmtpHYDsgYZgIZvw2d+JNUphycs=";
+      rev = "1cb7c7a11015983f6d173847d5a3574f8e20107b";
+      hash = "sha256-zdaFE5G19MLH4W5ZF0HfRNNMJV9Evp+X70eXHDmD/pA=";
    };
    generate = true;
    meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
  };
+  starlark = buildGrammar {
+    language = "starlark";
+    version = "8ad93a7";
+    src = fetchFromGitHub {
+      owner = "amaanq";
+      repo = "tree-sitter-starlark";
+      rev = "8ad93a74c2a880bc16325affba3cc66c14bb2bde";
+      hash = "sha256-HHGE7P/QAPCyu7wecRiDLrQIm8lndFjKOOb9xiyXsfc=";
+    };
+    meta.homepage = "https://github.com/amaanq/tree-sitter-starlark";
+  };
  supercollider = buildGrammar {
    language = "supercollider";
    version = "90c6d9f";
@ -1490,12 +1611,12 @@
  };
  swift = buildGrammar {
    language = "swift";
-    version = "0c32d29";
+    version = "fe2e325";
    src = fetchFromGitHub {
      owner = "alex-pinkus";
      repo = "tree-sitter-swift";
-      rev = "0c32d2948b79939b6464d9ced40fca43912cd486";
-      hash = "sha256-LyeK/fOQBO10blHCXYyGvmzk/U3uIj4tfjdH+p6aVs4=";
+      rev = "fe2e325a45056cdb3fcda821c03b8cef0d79e508";
+      hash = "sha256-ldPHpYhuAbodMPY8t8X7UiMY8kcds28r75R3Hqnlqv8=";
    };
    generate = true;
    meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@ -1604,12 +1725,12 @@
  };
  tsx = buildGrammar {
    language = "tsx";
-    version = "5d20856";
+    version = "c6e56d4";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-typescript";
-      rev = "5d20856f34315b068c41edaee2ac8a100081d259";
-      hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ=";
+      rev = "c6e56d44c686a67c89e29e773e662567285d610f";
+      hash = "sha256-usZAbf2sTNO78ldiiex6i94dh73kH6QOV0jjf5StuO0=";
    };
    location = "tsx";
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
@ -1638,24 +1759,35 @@
  };
  typescript = buildGrammar {
    language = "typescript";
-    version = "5d20856";
+    version = "c6e56d4";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-typescript";
-      rev = "5d20856f34315b068c41edaee2ac8a100081d259";
-      hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ=";
+      rev = "c6e56d44c686a67c89e29e773e662567285d610f";
+      hash = "sha256-usZAbf2sTNO78ldiiex6i94dh73kH6QOV0jjf5StuO0=";
    };
    location = "typescript";
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
  };
+  ungrammar = buildGrammar {
+    language = "ungrammar";
+    version = "debd26f";
+    src = fetchFromGitHub {
+      owner = "Philipp-M";
+      repo = "tree-sitter-ungrammar";
+      rev = "debd26fed283d80456ebafa33a06957b0c52e451";
+      hash = "sha256-ftvcD8I+hYqH3EGxaRZ0w8FHjBA34OSTTsrUsAOtayU=";
+    };
+    meta.homepage = "https://github.com/Philipp-M/tree-sitter-ungrammar";
+  };
  v = buildGrammar {
    language = "v";
-    version = "136f3a0";
+    version = "66cf9d3";
    src = fetchFromGitHub {
      owner = "vlang";
      repo = "vls";
-      rev = "136f3a0ad91ab8a781c2d4eb419df0a981839f69";
-      hash = "sha256-zmbR2Of/XEJuGvNmXAJ+C4aAMem51LVS3e1rSqjaSb0=";
+      rev = "66cf9d3086fb5ecc827cb32c64c5d812ab17d2c6";
+      hash = "sha256-/dNdUAmfG/HNMzeWi3PSSM9pwA60/zOjLi4NFXfn6YU=";
    };
    location = "tree_sitter_v";
    meta.homepage = "https://github.com/vlang/vls";
@ -1759,14 +1891,25 @@
    };
    meta.homepage = "https://github.com/Hubro/tree-sitter-yang";
  };
+  yuck = buildGrammar {
+    language = "yuck";
+    version = "48af129";
+    src = fetchFromGitHub {
+      owner = "Philipp-M";
+      repo = "tree-sitter-yuck";
+      rev = "48af129ab5411cd6f7ae2b36f53c1192572fa030";
+      hash = "sha256-G/aY771G7R78FhS7WxktlMf/0K+PR80WqfwmH+gQhwQ=";
+    };
+    meta.homepage = "https://github.com/Philipp-M/tree-sitter-yuck";
+  };
  zig = buildGrammar {
    language = "zig";
-    version = "6b3f578";
+    version = "f3bc9ff";
    src = fetchFromGitHub {
      owner = "maxxnino";
      repo = "tree-sitter-zig";
-      rev = "6b3f5788f38be900b45f5af5a753bf6a37d614b8";
-      hash = "sha256-KwMo1gwre8/AXkXXwQqPHZIEPXM26PK8SI0p3tmkt24=";
+      rev = "f3bc9ffe9ca10f52dee01999b5b6ce9a4074b0ac";
+      hash = "sha256-/Bk7UGdPOHmGc01eCNPHsXFMF4pAxE/gkhVxvRItZZ8=";
    };
    meta.homepage = "https://github.com/maxxnino/tree-sitter-zig";
  };
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix
@ -39,6 +39,7 @@
 , statix
 , stylish-haskell
 , tabnine
+, taskwarrior
 , tmux
 , tup
 , vim
@ -894,6 +895,10 @@ self: super: {
      };
    });

+  taskwarrior = buildVimPluginFrom2Nix {
+    inherit (taskwarrior) version pname;
+    src = "${taskwarrior.src}/scripts/vim";
+  };
  telescope-cheat-nvim = super.telescope-cheat-nvim.overrideAttrs (old: {
    dependencies = with self; [ sqlite-lua telescope-nvim ];
  });
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix
@ -2597,8 +2597,8 @@ let
        mktplcRef = {
          name = "code-spell-checker";
          publisher = "streetsidesoftware";
-          version = "2.18.0";
-          sha256 = "sha256-HwexlpPW15sXoxPQXDHWcQ8Yvz/5KMtZO4A34rXoXQ8=";
+          version = "2.19.0";
+          sha256 = "sha256-c95u++tkK8hToauulY8faNITUmsCBEeC2B8mHY0oEmA=";
        };
        meta = with lib; {
          changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";
--- a/third_party/nixpkgs/pkgs/applications/emulators/cemu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/cemu/default.nix
@ -31,13 +31,13 @@

 stdenv.mkDerivation rec {
  pname = "cemu";
-  version = "2.0-26";
+  version = "2.0-28";

  src = fetchFromGitHub {
    owner = "cemu-project";
    repo = "Cemu";
    rev = "v${version}";
-    hash = "sha256-+y+PJE2biRvuxIwrFVMjmkZyD8/zhHVMw6vzNKlsOZE=";
+    hash = "sha256-qKrj3XPtFVy0/KH18D0oCeVUQQmIdkYJYrCKD82c/+s=";
  };

  patches = [
--- a/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix
@ -108,9 +108,13 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
  ])));

  patches = [ ]
-    # Wine requires `MTLDevice.registryID` for `winemac.drv`, but that property is not available
-    # in the 10.12 SDK (current SDK on x86_64-darwin). Work around that by using selector syntax.
-    ++ lib.optional stdenv.isDarwin ./darwin-metal-compat.patch
+    ++ lib.optionals stdenv.isDarwin [
+      # Wine requires `MTLDevice.registryID` for `winemac.drv`, but that property is not available
+      # in the 10.12 SDK (current SDK on x86_64-darwin). Work around that by using selector syntax.
+      ./darwin-metal-compat.patch
+      # Wine requires `qos.h`, which is not included by default on the 10.12 SDK in nixpkgs.
+      ./darwin-qos.patch
+    ]
    ++ patches';

  configureFlags = prevConfigFlags
--- a/third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-qos.patch
+++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-qos.patch
@ -0,0 +1,12 @@
+diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
+index cde37c48b0d..be237bc0ad3 100644
+--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
+@@ -65,6 +65,7 @@
+ # undef LoadResource
+ # undef GetCurrentThread
+ # include <pthread.h>
+# include <pthread/qos.h>
+ # include <mach/mach.h>
+ # include <mach/mach_error.h>
+ # include <mach-o/getsect.h>
--- a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix
@ -145,8 +145,8 @@ in rec {

  winetricks = fetchFromGitHub rec {
    # https://github.com/Winetricks/winetricks/releases
-    version = "20220411";
-    hash = "sha256-FjH10nZDYbqXI6/vKpZJKfv2maXSVkahNDf5UTU3eyU=";
+    version = "20230212";
+    hash = "sha256-pd37QTcqY5ZaVBssGecuqziOIq1p0JH0ZDB+oLmp9JU=";
    owner = "Winetricks";
    repo = "winetricks";
    rev = version;
--- a/third_party/nixpkgs/pkgs/applications/emulators/yapesdl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/yapesdl/default.nix
@ -5,20 +5,21 @@
 , SDL2
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (self: {
  pname = "yapesdl";
-  version = "0.70.2";
+  version = "0.71.2";

  src = fetchFromGitHub {
    owner = "calmopyrin";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-51P6wNaSfVA3twu+yRUKXguEmVBvuuEnHxH1Zl1vsCc=";
+    repo = "yapesdl";
+    rev = "v${self.version}";
+    hash = "sha256-QGF3aS/YSzdGxHONKyA/iTewEVYsjBAsKARVMXkFV2k=";
  };

  nativeBuildInputs = [
    pkg-config
  ];
+
  buildInputs = [
    SDL2
  ];
@ -27,17 +28,17 @@ stdenv.mkDerivation rec {

  installPhase = ''
    runHook preInstall
-    install --directory $out/bin $out/share/doc/$pname
-    install yapesdl $out/bin/
-    install README.SDL $out/share/doc/$pname/
+    install -Dm755 yapesdl -t $out/bin/
+    install -Dm755 README.SDL -t $out/share/doc/yapesdl/
    runHook postInstall
  '';

-  meta = with lib; {
+  meta = {
    homepage = "http://yape.plus4.net/";
    description = "Multiplatform Commodore 64 and 264 family emulator";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ AndersonTorres ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    platforms = lib.platforms.unix;
+    broken = stdenv.isDarwin;
  };
-}
+})
--- a/third_party/nixpkgs/pkgs/applications/graphics/geeqie/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/geeqie/default.nix
@ -1,5 +1,7 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, gettext, intltool
+{ lib, stdenv, fetchFromGitHub, pkg-config, meson, ninja, xxd, gettext, intltool
 , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida
+, libarchive, djvulibre, libheif, openjpeg, libjxl, libraw, lua5_3, poppler
+, gspell, libtiff, libwebp
 , wrapGAppsHook, fetchpatch, doxygen
 , nix-update-script
 }:
@ -12,31 +14,26 @@ stdenv.mkDerivation rec {
    owner = "BestImageViewer";
    repo = "geeqie";
    rev = "v${version}";
-    sha256 = "sha256-O+yz/uNxueR+naEJG8EZ+k/JutRjJ5wwbB9DYb8YNLw=";
+    sha256 = "sha256-0GOX77vZ4KZkvwnR1vlv52tlbR+ciwl3ycxbOIcDOqU=";
  };

-  patches = [
-    # Do not build the changelog as this requires markdown.
-    (fetchpatch {
-      name = "geeqie-1.4-goodbye-changelog.patch";
-      url = "https://src.fedoraproject.org/rpms/geeqie/raw/132fb04a1a5e74ddb333d2474f7edb9a39dc8d27/f/geeqie-1.4-goodbye-changelog.patch";
-      sha256 = "00a35dds44kjjdqsbbfk0x9y82jspvsbpm2makcm1ivzlhjjgszn";
-    })
-  ];
-
  postPatch = ''
    patchShebangs .
+    # libtiff detection is broken and looks for liblibtiff...
+    # fixed upstream, to remove for 2.1
+    substituteInPlace meson.build --replace 'libtiff' 'tiff'
  '';

-  preConfigure = "./autogen.sh";
-
  nativeBuildInputs =
-    [ pkg-config autoconf automake gettext intltool
+    [ pkg-config gettext intltool
      wrapGAppsHook doxygen
+      meson ninja xxd
    ];

  buildInputs = [
    gtk3 lcms2 exiv2 libchamplain clutter-gtk ffmpegthumbnailer fbida
+    libarchive djvulibre libheif openjpeg libjxl libraw lua5_3 poppler
+    gspell libtiff libwebp
  ];

  postInstall = ''
--- a/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix
@ -10,17 +10,13 @@ with lib;

 perlPackages.buildPerlPackage rec {
  pname = "gscan2pdf";
-  version = "2.12.8";
+  version = "2.13.2";

  src = fetchurl {
    url = "mirror://sourceforge/gscan2pdf/gscan2pdf-${version}.tar.xz";
-    hash = "sha256-dmN2fMBDZqgvdHQryQgjmBHeH/h2dihRH8LkflFYzTk=";
+    hash = "sha256-NGz6DUa7TdChpgwmD9pcGdvYr3R+Ft3jPPSJpybCW4Q=";
  };

-  patches = [
-    ./ffmpeg5-compat.patch
-  ];
-
  nativeBuildInputs = [ wrapGAppsHook ];

  buildInputs =
--- a/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch
+++ b/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch
@ -1,15 +0,0 @@
--- a/t/351_unpaper.t
-+++ b/t/351_unpaper.t
-@@ -88,8 +88,10 @@
- 
-                         # if we use unlike, we no longer
-                         # know how many tests there will be
-                        if ( $msg !~
-/(deprecated|Encoder did not produce proper pts, making some up)/
-+                        if ( $msg !~ /( deprecated |
-+                            \Qdoes not contain an image sequence pattern\E |
-+                            \QEncoder did not produce proper pts, making some up\E |
-+                            \Quse the -update option\E )/x
-                           )
-                         {
-                             fail 'no warnings';
--- a/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "pdfcpu";
-  version = "0.3.13";
+  version = "0.4.0";

  src = fetchFromGitHub {
    owner = "pdfcpu";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-CFKo8YEAXAniX+jL2A0naJUOn3KAWwcrPsabdiZevhI=";
+    sha256 = "sha256-l3vJDF2c6h/trfnAGxu7XEoDoj7bB4tATBUlxKFYfUs=";
  };

-  vendorSha256 = "sha256-3y42rbhurGhCI9PuSayxmLem0tv/nTjBwYxF3Dk6/yM=";
+  vendorSha256 = "sha256-611eLYm+OPIdmax2KwYNjuQEGqyZd6SXvhUHzRdLzaI=";

  # No tests
  doCheck = false;
--- a/third_party/nixpkgs/pkgs/applications/graphics/rnote/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/rnote/default.nix
@ -23,19 +23,19 @@

 stdenv.mkDerivation rec {
  pname = "rnote";
-  version = "0.5.14";
+  version = "0.5.16";

  src = fetchFromGitHub {
    owner = "flxzt";
    repo = "rnote";
    rev = "v${version}";
-    hash = "sha256-55hB8UyK+EPJ6/Yj5yNK6endNU9Ux/kZmQNjcrYq6KU=";
+    hash = "sha256-blpANUfFam46Vyyc3vaB7vX07CRMtdMZR2n7FOLGgaU=";
  };

  cargoDeps = rustPlatform.fetchCargoTarball {
    inherit src;
    name = "${pname}-${version}";
-    hash = "sha256-NPRImc0nVhYgq9JfGoSM1mT1Z6KQjVWgoLIagOUCM5M=";
+    hash = "sha256-vVU/OVwtIPRw1Ohe5EIqovhyd4oYOR7CPISz8Zo74r0=";
  };

  nativeBuildInputs = [
--- a/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix
@ -1,14 +1,10 @@
 { stdenv, lib, fetchFromGitHub, fetchpatch, cairo, libxkbcommon
-, pango, fribidi, harfbuzz, pcre, pkg-config
-, ncursesSupport ? true, ncurses ? null
-, waylandSupport ? true, wayland ? null, wayland-protocols ? null
-, x11Support ? true, xorg ? null
+, pango, fribidi, harfbuzz, pcre, pkg-config, scdoc
+, ncursesSupport ? true, ncurses
+, waylandSupport ? true, wayland, wayland-protocols, wayland-scanner
+, x11Support ? true, xorg
 }:

-assert ncursesSupport -> ncurses != null;
-assert waylandSupport -> ! lib.elem null [wayland wayland-protocols];
-assert x11Support -> xorg != null;
-
 stdenv.mkDerivation rec {
  pname = "bemenu";
  version = "0.6.14";
@ -20,14 +16,9 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-bMnnuT+LNNKphmvVcD1aaNZxasSGOEcAveC4stCieG8=";
  };

-  nativeBuildInputs = [ pkg-config pcre ];
-
-  makeFlags = ["PREFIX=$(out)"];
-
-  buildFlags = ["clients"]
-    ++ lib.optional ncursesSupport "curses"
-    ++ lib.optional waylandSupport "wayland"
-    ++ lib.optional x11Support "x11";
+  strictDeps = true;
+  nativeBuildInputs = [ pkg-config scdoc ]
+    ++ lib.optionals waylandSupport [ wayland-scanner ];

  buildInputs = with lib; [
    cairo
@ -42,6 +33,13 @@ stdenv.mkDerivation rec {
      xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb
    ];

+  makeFlags = ["PREFIX=$(out)"];
+
+  buildFlags = ["clients"]
+    ++ lib.optional ncursesSupport "curses"
+    ++ lib.optional waylandSupport "wayland"
+    ++ lib.optional x11Support "x11";
+
  meta = with lib; {
    homepage = "https://github.com/Cloudef/bemenu";
    description = "Dynamic menu library and client program inspired by dmenu";
--- a/third_party/nixpkgs/pkgs/applications/misc/calcure/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/calcure/default.nix
@ -0,0 +1,38 @@
+{ lib
+, python3
+, fetchFromGitHub
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "calcure";
+  version = "2.8.2";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "anufrievroman";
+    repo = "calcure";
+    rev = version;
+    hash = "sha256-CWuyBjIhEYb3zOIXT0+pVs9fFahMi04yq2sJjDMwKTI=";
+  };
+
+  nativeBuildInputs = [
+    python3.pkgs.setuptools
+    python3.pkgs.wheel
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    jdatetime
+    holidays
+    ics
+    attrs
+  ];
+
+  pythonImportsCheck = [ "calcure" ];
+
+  meta = with lib; {
+    description = "Modern TUI calendar and task manager with minimal and customizable UI";
+    homepage = "https://github.com/anufrievroman/calcure";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dit7ya ];
+  };
+}
--- a/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix
@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage rec {
  name = "cotp";
-  version = "1.2.1";
+  version = "1.2.3";

  src = fetchFromGitHub {
    owner = "replydev";
    repo = "cotp";
    rev = "v${version}";
-    hash = "sha256-DIb/lgJxwg+QuqzN/0YoUV1iZwRqh6PAN0KRK7TbWDs=";
+    hash = "sha256-Pg07iq2jj8cUA4iQsY52cujmUZLYrbTG5Zj+lITxpls=";
  };

-  cargoHash = "sha256-uvH4mdI8ya/MJJngXQ98oXjG7JjUdvPwIzvJrdwlOEE=";
+  cargoHash = "sha256-gH9axiM0Qgl2TdJUpnDONHtU2I5l03SrKEe+2l5V21Y=";

  buildInputs = lib.optionals stdenv.isLinux [ libxcb ]
    ++ lib.optionals stdenv.isDarwin [ AppKit ];
--- a/third_party/nixpkgs/pkgs/applications/misc/duden/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/duden/default.nix
@ -0,0 +1,40 @@
+{ lib
+, python3
+, fetchFromGitHub
+}:
+
+python3.pkgs.buildPythonPackage rec {
+  pname = "duden";
+  version = "0.18.0";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "radomirbosak";
+    repo = "duden";
+    rev = version;
+    hash = "sha256-ZrarN09Znw4m6YiZxD7q7dTJ49WjmHDobLnOt8JCwvc=";
+  };
+
+  nativeBuildInputs = [
+    python3.pkgs.poetry-core
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    beautifulsoup4
+    crayons
+    pyxdg
+    pyyaml
+    requests
+    setuptools
+  ];
+
+  pythonImportsCheck = [ "duden" ];
+
+  meta = with lib; {
+    description = "CLI for http://duden.de dictionary written in Python";
+    homepage = "https://github.com/radomirbosak/duden";
+    changelog = "https://github.com/radomirbosak/duden/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
+  };
+}
--- a/third_party/nixpkgs/pkgs/applications/misc/effitask/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/effitask/default.nix
@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "effitask";
-  version = "1.4.1";
+  version = "1.4.2";

  src = fetchFromGitHub {
    owner = "sanpii";
    repo = pname;
    rev = version;
-    sha256 = "sha256-nZn+mINIqAnaCKZCiywG8/BOPx6TlSe0rKV/8gcW/B4=";
+    sha256 = "sha256-6BA/TCCqVh5rtgGkUgk8nIqUzozipC5rrkbXMDWYpdQ=";
  };

-  cargoSha256 = "sha256-aCjZRJNsxx75ghK0N95Q9w0h5H5mW9/77j/fumDrvyM=";
+  cargoHash = "sha256-ScqDNfWMFT8a1HOPjpw4J8EBrVSusIkOYReYeArZvZ8=";

  nativeBuildInputs = [ pkg-config ];

--- a/third_party/nixpkgs/pkgs/applications/misc/fead/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/fead/default.nix
@ -0,0 +1,37 @@
+{ lib, stdenv, fetchFromSourcehut, python3, help2man }:
+
+stdenv.mkDerivation rec {
+  pname = "fead";
+  version = "0.1.3";
+
+  src = fetchFromSourcehut {
+    owner = "~cnx";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-cW0GxyvC9url2QAAWD0M2pR4gBiPA3eeAaw77TwMV/0=";
+  };
+
+  nativeBuildInputs = [ help2man ];
+  buildInputs = [ python3 ];
+
+  # Needed for man page generation in build phase
+  postPatch = ''
+    patchShebangs src/fead.py
+  '';
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  # Already done in postPatch phase
+  dontPatchShebangs = true;
+
+  # The package has no tests.
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Advert generator from web feeds";
+    homepage = "https://git.sr.ht/~cnx/fead";
+    license = licenses.agpl3Plus;
+    changelog = "https://git.sr.ht/~cnx/fead/refs/${version}";
+    maintainers = with maintainers; [ McSinyx ];
+  };
+}
--- a/third_party/nixpkgs/pkgs/applications/misc/feedbackd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/feedbackd/default.nix
@ -2,6 +2,8 @@
 , stdenv
 , fetchFromGitLab
 , docbook-xsl-nons
+, docutils
+, gi-docgen
 , gobject-introspection
 , gtk-doc
 , libxslt
@ -22,30 +24,33 @@ let
    domain = "source.puri.sm";
    owner = "Librem5";
    repo = "feedbackd-device-themes";
-    rev = "v0.0.20220523";
-    sha256 = "sha256-RyUZj+tpJSYhyoK+E98CTIoHwXwBdB1YHVnO5821exo=";
+    rev = "v0.1.0";
+    sha256 = "sha256-YK9fJ3awmhf1FAhdz95T/POivSO93jsNApm+u4OOZ80=";
  };
 in
 stdenv.mkDerivation rec {
  pname = "feedbackd";
-  # Not an actual upstream project release,
-  # only a Debian package release that is tagged in the upstream repo
-  version = "0.0.1";
+  version = "0.1.0";

-  outputs = [ "out" "dev" ]
-    # remove if cross-compiling gobject-introspection works
-    ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ];
+  outputs = [ "out" "dev" "devdoc" ];

  src = fetchFromGitLab {
    domain = "source.puri.sm";
    owner = "Librem5";
    repo = "feedbackd";
    rev = "v${version}";
-    hash = "sha256-l1FhECLPq8K9lzQ50sI/aH7fwR9xW1ATyk7EWRmLzuQ=";
+    hash = "sha256-7H5Ah4zo+wLKd0WoKoOgtIm7HcUSw8PTf/KzBlY75oc=";
+    fetchSubmodules = true;
  };

+  depsBuildBuild = [
+    pkg-config
+  ];
+
  nativeBuildInputs = [
    docbook-xsl-nons
+    docutils # for rst2man
+    gi-docgen
    gobject-introspection
    gtk-doc
    libxslt
@ -64,11 +69,8 @@ stdenv.mkDerivation rec {
  ];

  mesonFlags = [
-    "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
+    "-Dgtk_doc=true"
    "-Dman=true"
-    # TODO(mindavi): introspection broken due to https://github.com/NixOS/nixpkgs/issues/72868
-    #                can be removed if cross-compiling gobject-introspection works.
-    "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}"
  ];

  nativeCheckInputs = [
@ -83,6 +85,17 @@ stdenv.mkDerivation rec {
    cp ${themes}/data/* $out/share/feedbackd/themes/
  '';

+  postFixup = ''
+    # Move developer documentation to devdoc output.
+    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
+    if [[ -d "$out/share/doc" ]]; then
+        find -L "$out/share/doc" -type f -regex '.*\.devhelp2?' -print0 \
+          | while IFS= read -r -d ''' file; do
+            moveToOutput "$(dirname "''${file/"$out/"/}")" "$devdoc"
+        done
+    fi
+  '';
+
  meta = with lib; {
    description = "A daemon to provide haptic (and later more) feedback on events";
    homepage = "https://source.puri.sm/Librem5/feedbackd";
--- a/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "fetchmail";
-  version = "6.4.36";
+  version = "6.4.37";

  src = fetchurl {
    url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
-    sha256 = "sha256-cA1DODjT4p4wRFKuxWshh09TjsJBE/3LslE5xfLtwjo=";
+    sha256 = "sha256-ShguXYk+mr5qw3rnHlQmUfzm1gYjT8c1wqquGGV+aeo=";
  };

  buildInputs = [ openssl python3 ];
--- a/third_party/nixpkgs/pkgs/applications/misc/hcl2json/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/hcl2json/default.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "hcl2json";
-  version = "0.3.4";
+  version = "0.5.0";

  src = fetchFromGitHub {
    owner = "tmccombs";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-Xr94Bq3w2j+hUoGy1mSLy3WCQiwrfS/5IL6i6CwKiPs=";
+    sha256 = "sha256-kmg483HidFL9mP6jXisLN5VR0dd0xzPXSwqTR8tOCrM=";
  };

-  vendorSha256 = "sha256-Mz97GBxx/7oFjW6u5DG6JhvPRzn+hqtfqHdYv47L898=";
+  vendorHash = "sha256-ejbCY5S/aeY5Sp+5A20y5kUDY0yxgnMUxtr3UPvtic0=";

  subPackages = [ "." ];

--- a/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix
@ -12,11 +12,11 @@

 stdenv.mkDerivation rec {
  name = "holochain-launcher";
-  version = "0.9.0";
+  version = "0.9.1";

  src = fetchurl {
    url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb";
-    sha256 = "sha256-uG7EqM2CKDp+mQQp6wKs0yN0OX8N7O53VaiNcFYh6OY=";
+    sha256 = "sha256-vYsJBMtdkbe87Xn8Ah0eT+azFWfm3ZUooejs7oB2KVQ=";
  };

  nativeBuildInputs = [
--- a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "hugo";
-  version = "0.111.1";
+  version = "0.111.2";

  src = fetchFromGitHub {
    owner = "gohugoio";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-3bg7cmM05ekR5gtJCEJk3flplw8MRc9hVqlZx3ZUIaw=";
+    hash = "sha256-UVxE5f+WLIoCEhFh1lbOE8LoXVN/+BzHCpJ61Gqknzc=";
  };

  vendorHash = "sha256-xiysjJi3bL0xIoEEo7xXQbznFzwKJrCT6l/bxEbDRUI=";
--- a/third_party/nixpkgs/pkgs/applications/misc/krabby/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/krabby/default.nix
@ -0,0 +1,23 @@
+{ lib
+, rustPlatform
+, fetchCrate
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "krabby";
+  version = "0.1.6";
+
+  src = fetchCrate {
+    inherit pname version;
+    sha256 = "sha256-BUX3D/UXJt9OxajUYaUDxI0u4t4ntSxqI1PMtk5IZNQ=";
+  };
+
+  cargoHash = "sha256-XynD19mlCmhHUCfbr+pmWkpb+D4+vt3bsgV+bpbUoaY=";
+
+  meta = with lib; {
+    description = "Print pokemon sprites in your terminal";
+    homepage = "https://github.com/yannjor/krabby";
+    changelog = "https://github.com/yannjor/krabby/releases/tag/v${version}";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ ruby0b ];
+  };
+}
--- a/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "limesctl";
-  version = "3.1.3";
+  version = "3.2.0";

  src = fetchFromGitHub {
    owner = "sapcc";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-fi36jsQr/Mn1FyOlle/WSpREQgZU6+h4IJzd3ZfItvI=";
+    sha256 = "sha256-/9focZIm6tVnkAGIZYTJ9uewXKLv/x74LEMUZbXInb0=";
  };

-  vendorSha256 = "sha256-gcIPASIk4Zq8y+KppYNRkf/9guCsYv9XskFANrqOCts=";
+  vendorHash = "sha256-Zc8X29tsSsM/tkSYvplF1LxBS76eSs+cm5Li3OE/3o8=";

  subPackages = [ "." ];

--- a/third_party/nixpkgs/pkgs/applications/misc/llpp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/llpp/default.nix
@ -1,27 +1,34 @@
-{ stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11, jbig2dec, openjpeg, libjpeg , lcms2, harfbuzz,
+{ stdenv, lib, substituteAll, makeWrapper, fetchFromGitHub, fetchpatch, ocaml, pkg-config, mupdf, libX11, jbig2dec, openjpeg, libjpeg , lcms2, harfbuzz,
 libGLU, libGL, gumbo, freetype, zlib, xclip, inotify-tools, procps }:

 assert lib.versionAtLeast (lib.getVersion ocaml) "4.07";

 stdenv.mkDerivation rec {
  pname = "llpp";
-  version = "33";
+  version = "41";

-  src = fetchgit {
-    url = "git://repo.or.cz/llpp.git";
+  src = fetchFromGitHub {
+    owner = "criticic";
+    repo = pname;
    rev = "v${version}";
-    sha256 = "0shqzhaflm2yhkx6c0csq9lxp1s1r7lh5kgpx9q5k06xya2a7yvs";
-    fetchSubmodules = false;
+    hash = "sha256-Doj0zLYI1pi7eK01+29xFLYPtc8+fWzj10292+PmToE=";
  };

-  patches = (substituteAll {
-    inherit version;
-    src = ./fix-build-bash.patch;
-  });
+  patches = [
+    (fetchpatch {
+      name = "system-makedeps.patch";
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/system-makedeps.patch?h=llpp&id=0d2913056aaf3dbf7431e57b7b08b55568ba076c";
+      hash = "sha256-t9PLXsM8+exCeYqJBe0LSDK0D2rpktmozS8qNcEAcHo=";
+    })
+  ];
+
+  postPatch = ''
+    sed -i "2d;s/ver=.*/ver=${version}/" build.bash
+  '';

  strictDeps = true;

-  nativeBuildInputs = [ makeWrapper ocaml ];
+  nativeBuildInputs = [ makeWrapper ocaml pkg-config ];
  buildInputs = [ mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ];

  dontStrip = true;
@ -53,9 +60,6 @@ stdenv.mkDerivation rec {
    homepage = "https://repo.or.cz/w/llpp.git";
    description = "A MuPDF based PDF pager written in OCaml";
    platforms = platforms.linux;
-    # Project is unmaintained and fails to build:
-    # link.c:987:27: error: invalid operands to binary >= (have 'fz_location' and 'int')
-    broken = true;
    maintainers = with maintainers; [ pSub ];
    license = licenses.gpl3;
  };
--- a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix
@ -15,12 +15,12 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "mkgmap";
-  version = "4905";
+  version = "4906";

  src = fetchsvn {
    url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk";
    rev = version;
-    sha256 = "sha256-EYUysLit/bO/IjVmAbxqIvVFm9Ub50+RKFn7ZdspapU=";
+    sha256 = "sha256-N1VU5XOENCQiUnDCFpotx+8Pr3VFuWLu1ABcbm0feOM=";
  };

  patches = [
--- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix
@ -12,20 +12,20 @@
 let
  inherit (stdenv.hostPlatform) system;
  pname = "obsidian";
-  version = "1.1.15";
+  version = "1.1.16";
  appname = "Obsidian";
  meta = with lib; {
    description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
    homepage = "https://obsidian.md";
    downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases";
    license = licenses.obsidian;
-    maintainers = with maintainers; [ atila conradmearns zaninime opeik ];
+    maintainers = with maintainers; [ atila conradmearns zaninime qbit ];
  };

  filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
  src = fetchurl {
    url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
-    sha256 = if stdenv.isDarwin then "sha256-8cHNIpgRhEQRRcuM0t6zZNweb92nMe8GopgjYfOLRSA=" else "sha256-rDA0GXQ++QAT4UaT23WkCA5CKCuJsF4ca0g086AiCao=";
+    sha256 = if stdenv.isDarwin then "sha256-0p9vYHd1+kH+2ZTJ5OPeIEKNOzUGRU/M1xlmtyPOvJo=" else "sha256-zO5RpRkatGd5kJTPrTQ5xAYHntyw/7aQUSpZFUnDMnw=";
  };

  icon = fetchurl {
--- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix
@ -16,7 +16,7 @@ let
    packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) (
      [
        (
-          # with version 3 of flask-limiter octoprint 1.8.6 fails to start with
+          # with version 3 of flask-limiter octoprint 1.8.7 fails to start with
          #  TypeError: Limiter.__init__() got multiple values for argument 'key_func'
          self: super: {
            flask-limiter = super.flask-limiter.overridePythonAttrs (oldAttrs: rec {
@ -105,13 +105,13 @@ let
          self: super: {
            octoprint = self.buildPythonPackage rec {
              pname = "OctoPrint";
-              version = "1.8.6";
+              version = "1.8.7";

              src = fetchFromGitHub {
                owner = "OctoPrint";
                repo = "OctoPrint";
                rev = version;
-                hash = "sha256-DCUesPy4/g7DYN/9CDRvwAWHcv4dFsF+gsysg5UWThQ=";
+                hash = "sha256-g4PYB9YbkX0almRPgMFlb8D633Y5fc3H+Boa541suqc=";
              };

              propagatedBuildInputs = with self; [
--- a/third_party/nixpkgs/pkgs/applications/misc/pe-bear/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/pe-bear/default.nix
@ -8,13 +8,13 @@

 stdenv.mkDerivation rec {
  pname = "pe-bear";
-  version = "0.6.1";
+  version = "0.6.5";

  src = fetchFromGitHub {
    owner = "hasherezade";
    repo = "pe-bear";
    rev = "v${version}";
-    sha256 = "jzgsjqic5rBsyuwJW9T44rKM8rKDce564VAogDvsLho=";
+    sha256 = "sha256-qFEfrXX2Rpmo4eF1Z/dKBN/NxMovK3mDfQPxYp85eB8=";
    fetchSubmodules = true;
  };

--- a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix
@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "pueue";
-  version = "3.1.1";
+  version = "3.1.2";

  src = fetchFromGitHub {
    owner = "Nukesor";
    repo = "pueue";
    rev = "v${version}";
-    hash = "sha256-5xHY8DOQnOdYqNyfAS2kMuW2vxAuoSe6RaOItnAJCkQ=";
+    hash = "sha256-Q9NHkVOWVWAty6iIhN0GmUkKB+nDqmxiPVnhbQvup9M=";
  };

-  cargoHash = "sha256-3IOtx1aeth6QBjY6aILtzxhjZddovD7KIKzNhVCabfU=";
+  cargoHash = "sha256-YSD7RXU3eBlELx76gU5eNOGkSoK9SRQZOV+7lil1fyQ=";

  nativeBuildInputs = [
    installShellFiles
--- a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix
@ -18,14 +18,14 @@

 mkDerivation rec {
  pname = "qcad";
-  version = "3.27.9.2";
+  version = "3.27.9.3";

  src = fetchFromGitHub {
    name = "qcad-${version}-src";
    owner = "qcad";
    repo = "qcad";
    rev = "v${version}";
-    sha256 = "sha256-RpyckKXU8WN/bptKp6G5gNVSU3RzNFYnM0eWLf3E2Yg=";
+    sha256 = "sha256-JEUV8TtVYSlO+Gmg/ktMTmTlOmH+2zc6/fLkVHD7eBc=";
  };

  patches = [
--- a/third_party/nixpkgs/pkgs/applications/misc/somebar/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/somebar/default.nix
@ -17,13 +17,13 @@ in

 stdenv.mkDerivation rec {
  pname = "somebar";
-  version = "1.0.0";
+  version = "1.0.3";

  src = fetchFromSourcehut {
    owner = "~raphi";
    repo = "somebar";
    rev = "${version}";
-    sha256 = "sha256-snCW7dC8JI/pg1+HLjX0JXsTzwa3akA6rLcSNgKLF0c=";
+    sha256 = "sha256-PBxCy1dZrOL1nmhVDQozvF0XL79uKMhhERGNpPPzaRU=";
  };

  nativeBuildInputs = [ meson ninja pkg-config ];
--- a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix
@ -28,14 +28,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */
 }:

 mkDerivation rec {
-  version = "1.3.2";
+  version = "1.3.3";
  pname = "syncthingtray";

  src = fetchFromGitHub {
    owner = "Martchus";
    repo = "syncthingtray";
    rev = "v${version}";
-    sha256 = "sha256-zLZw6ltdgO66dvKdLXhr/a6r8UhbSAx06jXrgMARHyw=";
+    sha256 = "sha256-6H5pV7/E4MP9UqVpm59DqfcK8Z8GwknO3+oWxAcnIsk=";
  };

  buildInputs = [
--- a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/taskwarrior/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, libuuid, gnutls, python3, xdg-utils }:
+{ lib, stdenv, fetchFromGitHub, cmake, libuuid, gnutls, python3, xdg-utils, installShellFiles }:

 stdenv.mkDerivation rec {
  pname = "taskwarrior";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
      --replace "xdg-open" "${lib.getBin xdg-utils}/bin/xdg-open"
  '';

-  nativeBuildInputs = [ cmake libuuid gnutls python3 ];
+  nativeBuildInputs = [ cmake libuuid gnutls python3 installShellFiles ];

  doCheck = true;
  preCheck = ''
@ -26,10 +26,18 @@ stdenv.mkDerivation rec {
  checkTarget = "test";

  postInstall = ''
-    mkdir -p "$out/share/bash-completion/completions"
-    ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/task.bash"
-    mkdir -p "$out/share/fish/vendor_completions.d"
-    ln -s "../../../share/doc/task/scripts/fish/task.fish" "$out/share/fish/vendor_completions.d/"
+    # ZSH is installed automatically from some reason, only bash and fish need
+    # manual installation
+    installShellCompletion --cmd task \
+      --bash $out/share/doc/task/scripts/bash/task.sh \
+      --fish $out/share/doc/task/scripts/fish/task.fish
+    rm -r $out/share/doc/task/scripts/bash
+    rm -r $out/share/doc/task/scripts/fish
+    # Install vim and neovim plugin
+    mkdir -p $out/share/vim-plugins
+    mv $out/share/doc/task/scripts/vim $out/share/vim-plugins/task
+    mkdir -p $out/share/nvim
+    ln -s $out/share/vim-plugins/task $out/share/nvim/site
  '';

  meta = with lib; {
--- a/third_party/nixpkgs/pkgs/applications/misc/tilemaker/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/tilemaker/default.nix
@ -3,23 +3,15 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "tilemaker";
-  version = "2.2.0";
+  version = "2.3.0";

  src = fetchFromGitHub {
    owner = "systemed";
    repo = "tilemaker";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-st6WDCk1RZ2lbfrudtcD+zenntyTMRHrIXw3nX5FHOU=";
+    hash = "sha256-O1zoRYNUeReIH2ZpL05SiwCZrZrM2IAkwhsP30k/hHc=";
  };

-  patches = [
-    # Fix build with Boost >= 1.79, remove on next upstream release
-    (fetchpatch {
-      url = "https://github.com/systemed/tilemaker/commit/252e7f2ad8938e38d51783d1596307dcd27ed269.patch";
-      hash = "sha256-YSkhmpzEYk/mxVPSDYdwZclooB3zKRjDPzqamv6Nvyc=";
-    })
-  ];
-
  postPatch = ''
    substituteInPlace src/tilemaker.cpp \
      --replace "config.json" "$out/share/tilemaker/config-openmaptiles.json" \
@ -48,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
  meta = with lib; {
    description = "Make OpenStreetMap vector tiles without the stack";
    homepage = "https://tilemaker.org/";
+    changelog = "https://github.com/systemed/tilemaker/blob/v${version}/CHANGELOG.md";
    license = licenses.free; # FTWPL
    maintainers = with maintainers; [ sikmir ];
    platforms = platforms.unix;
--- a/third_party/nixpkgs/pkgs/applications/misc/udict/0001-update-version-in-lock-file.patch
+++ b/third_party/nixpkgs/pkgs/applications/misc/udict/0001-update-version-in-lock-file.patch
@ -0,0 +1,25 @@
+From 4952ceece60ff2e7eabec45411b8824da6673bff Mon Sep 17 00:00:00 2001
+From: m <m@linuxistsuper.de>
+Date: Sun, 5 Mar 2023 11:25:40 +0100
+Subject: [PATCH] update version in lock file
+
+---
+ Cargo.lock | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index d571155..ca28bef 100644
+--- a/Cargo.lock
+++ b/Cargo.lock
+@@ -1554,7 +1554,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
+ 
+ [[package]]
+ name = "udict"
+-version = "0.1.1"
+version = "0.1.2"
+ dependencies = [
+  "reqwest",
+  "scraper",
+-- 
+2.38.4
+
--- a/third_party/nixpkgs/pkgs/applications/misc/udict/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/udict/default.nix
@ -0,0 +1,44 @@
+{ lib
+, stdenv
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, openssl
+, darwin
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "udict";
+  version = "0.1.2";
+
+  src = fetchFromGitHub {
+    owner = "lsmb";
+    repo = "udict";
+    rev = "v${version}";
+    hash = "sha256-vcyzMw2tWil4MULEkf25S6kXzqMG6JXIx6GibxxspkY=";
+  };
+
+  cargoHash = "sha256-WI+dz7FKa3kot3gWr/JK/v6Ua/u2ioZ04Jwk8t9r1ls=";
+
+  cargoPatches = [
+    ./0001-update-version-in-lock-file.patch
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.CoreFoundation
+    darwin.apple_sdk.frameworks.Security
+  ];
+
+  meta = with lib; {
+    description = "Urban Dictionary CLI - written in Rust";
+    homepage = "https://github.com/lsmb/udict";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
+  };
+}
--- a/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix
@ -10,14 +10,14 @@

 rustPlatform.buildRustPackage rec {
  pname = "zine";
-  version = "0.11.1";
+  version = "0.12.0";

  src = fetchCrate {
    inherit pname version;
-    sha256 = "sha256-iva66tN7pMW0LAvhTbL0Tmsvsdq1+96VciTlaNoVywI=";
+    sha256 = "sha256-ioWgEl+bMaEDjtEQq/4vURS6Q/V9+r72NTWstyHm4mI=";
  };

-  cargoHash = "sha256-xAA11Og5odn8eNbFNKiRUqLG/MLWPw1WSeNR9zGHs0U=";
+  cargoHash = "sha256-2BeImBebeO4kLXmBrGjPmAjbrsLUaS2y52KSazVITb0=";

  nativeBuildInputs = [
    pkg-config
--- a/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix
@ -15,16 +15,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "zola";
-  version = "0.16.1";
+  version = "0.17.1";

  src = fetchFromGitHub {
    owner = "getzola";
    repo = "zola";
    rev = "v${version}";
-    sha256 = "sha256-VkR7fM2WeI1itGq5kl54CVLnNW+NxIodkVKeGv8HoaU=";
+    hash = "sha256-+q6arKZjHVstnbPQhmuxdj/kCPTFf9L0jZYlPS+lksk=";
  };

-  cargoSha256 = "sha256-74QVFjDlT3ewx4sCK4/r5In0muqboBFEpMFBv2L5YaM=";
+  cargoHash = "sha256-mS+yQD7ggQJ/6TYgL54+lLsUbKQaZX9oxT2/GaFoWyI=";

  nativeBuildInputs = [
    cmake
@ -43,9 +43,9 @@ rustPlatform.buildRustPackage rec {

  postInstall = ''
    installShellCompletion --cmd zola \
-      --fish completions/zola.fish \
-      --zsh completions/_zola \
-      --bash completions/zola.bash
+      --bash <($out/bin/zola completion bash) \
+      --fish <($out/bin/zola completion fish) \
+      --zsh <($out/bin/zola completion zsh)
  '';

  passthru.tests.version = testers.testVersion { package = zola; };
--- a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix
@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "avalanchego";
-  version = "1.9.9";
+  version = "1.9.10";

  src = fetchFromGitHub {
    owner = "ava-labs";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-xaFSqcVVRXy1JYOWGnzoPKLnnxk9NgZ3FIZR3qydOLM=";
+    hash = "sha256-lzobtncxL/7Lf/+kVzIdyP0dTzerMJRAoT7OBFdeEgc=";
  };

-  vendorHash = "sha256-ZCIy1cQ62MNLor39Pi0/nU6KsbgG1z7SowMpj9tXLT8=";
+  vendorHash = "sha256-IxPJBpOSqcramegQ+M/U9p6ls6dStOi0OUdddDj11d0=";
  # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529
  proxyVendor = true;

--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix
@ -1,5 +1,7 @@
 { newScope, config, stdenv, fetchurl, makeWrapper
-, llvmPackages_14, ed, gnugrep, coreutils, xdg-utils
+, llvmPackages_14
+, llvmPackages_15
+, ed, gnugrep, coreutils, xdg-utils
 , glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit
 , libva, pipewire, wayland
 , gcc, nspr, nss, runCommand
@ -52,6 +54,9 @@ let
          inherit (upstream-info.deps.gn) url rev sha256;
        };
      });
+    } // lib.optionalAttrs (chromiumVersionAtLeast "111") rec {
+      llvmPackages = llvmPackages_15;
+      stdenv = llvmPackages_15.stdenv;
    });

    browser = callPackage ./browser.nix {
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
@ -19,9 +19,9 @@
    }
  },
  "beta": {
-    "version": "111.0.5563.50",
-    "sha256": "1iygqlgr7qqac489kb0s4z5mwvchhi7wkibj84ziqcxlbqlfrmni",
-    "sha256bin64": "0pgrqb18hbp1q54flg0c63v85bi11m4rc6f25f0h0x90lvl65d05",
+    "version": "111.0.5563.64",
+    "sha256": "0x20zqwq051a5j76q1c3m0ddf1hhcm6fgz3b7rqrfamjppia0p3x",
+    "sha256bin64": "1cl7zbsl0ndp5x1g0p1q511mn72iy72sqxycmlrccs9j8jmaiqgw",
    "deps": {
      "gn": {
        "version": "2022-12-12",
@ -32,15 +32,15 @@
    }
  },
  "dev": {
-    "version": "112.0.5596.2",
-    "sha256": "03s6phrqv3a6vdkig9npkvnpgc8hcfb6fqgxlmlcmhrf9cszvycg",
-    "sha256bin64": "1an3gmxcfkzfx30ympli8r7p3xp93i8zmvrayvgddvb8xszrbc3c",
+    "version": "112.0.5615.12",
+    "sha256": "1kkpfaqr3rzxlj7kn2l8gchvq17w03mcf3aajqv193jazcb083ci",
+    "sha256bin64": "1ci3vmr6q665rp8h7b1y7gmkv4zczjw5ryf0yycwfcll087ym6g6",
    "deps": {
      "gn": {
-        "version": "2023-02-07",
+        "version": "2023-02-17",
        "url": "https://gn.googlesource.com/gn",
-        "rev": "edf6ef4b06b42c58292faea78498aff76bdf68ed",
-        "sha256": "1l3wz5rxg6q4923gxwx7hrrbx8123i7iniw8ihajp7v4qz27xbcp"
+        "rev": "b25a2f8c2d33f02082f0f258350f5e22c0973108",
+        "sha256": "075p4jwk1apvwmqmvhwfw5f669ci7nxwjq9mz5aa2g5lz4fkdm4c"
      }
    }
  },
--- a/Show more
+++ b/Show more