Merge master into haskell-updates

2022-10-12 00:23:04 +00:00 · 2022-10-12 00:23:04 +00:00 · 7e82e2594e
parent bc7a5b525c cbb1dc26dd
commit 7e82e2594e
231 changed files with 30006 additions and 1958 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -11694,6 +11694,15 @@
    githubId = 373566;
    name = "Ronuk Raval";
  };
+  rrbutani = {
+    email = "rrbutani+nix@gmail.com";
+    github = "rrbutani";
+    githubId = 7833358;
+    keys = [{
+      fingerprint = "7DCA 5615 8AB2 621F 2F32  9FF4 1C7C E491 479F A273";
+    }];
+    name = "Rahul Butani";
+  };
  rski = {
    name = "rski";
    email = "rom.skiad+nix@gmail.com";
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@ -87,7 +87,7 @@ mediator_lua,,,,,,
 mpack,,,,,,
 moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn
 nvim-client,https://github.com/neovim/lua-client.git,,,,,
-nvim-cmp,,,,,
+nvim-cmp,,,,,,
 penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque
 plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,5.1,
 rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,,
@ -101,3 +101,4 @@ std.normalize,https://github.com/lua-stdlib/normalize.git,,,,,
 stdlib,,,,41.2.2,,vyp
 tl,,,,,,mephistophiles
 vstruct,https://github.com/ToxicFrog/vstruct.git,,,,,
+vusted,,,,,,figsoda
--- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
@ -488,6 +488,16 @@
          instead.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          The <literal>p4</literal> package now only includes the
+          open-source Perforce Helix Core command-line client and APIs.
+          It no longer installs the unfree Helix Core Server binaries
+          <literal>p4d</literal>, <literal>p4broker</literal>, and
+          <literal>p4p</literal>. To install the Helix Core Server
+          binaries, use the <literal>p4d</literal> package instead.
+        </para>
+      </listitem>
      <listitem>
        <para>
          The <literal>coq</literal> package and versioned variants
@ -636,6 +646,12 @@
          for vim).
        </para>
      </listitem>
+      <listitem>
+        <para>
+          The default <literal>kops</literal> version is now 1.25.1 and
+          support for 1.22 and older has been dropped.
+        </para>
+      </listitem>
      <listitem>
        <para>
          <literal>k3s</literal> no longer supports docker as runtime
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@ -162,6 +162,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
 - `services.hbase` has been renamed to `services.hbase-standalone`.
  For production HBase clusters, use `services.hadoop.hbase` instead.

+- The `p4` package now only includes the open-source Perforce Helix Core command-line client and APIs. It no longer installs the unfree Helix Core Server binaries `p4d`, `p4broker`, and `p4p`. To install the Helix Core Server binaries, use the `p4d` package instead.
+
 - The `coq` package and versioned variants starting at `coq_8_14` no
  longer include CoqIDE, which is now available through
  `coqPackages.coqide`. It is still possible to get CoqIDE as part of
@ -213,6 +215,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
  Use `configure.packages` instead.
 - Neovim can not be configured with plug anymore (still works for vim).

+- The default `kops` version is now 1.25.1 and support for 1.22 and older has been dropped.
+
 - `k3s` no longer supports docker as runtime due to upstream dropping support.

 - `k3s` supports `clusterInit` option, and it is enabled by default, for servers.
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
@ -38,9 +38,9 @@ with lib;
  # VM guest additions to improve host-guest interaction
  services.spice-vdagentd.enable = true;
  services.qemuGuest.enable = true;
-  virtualisation.vmware.guest.enable = true;
+  virtualisation.vmware.guest.enable = pkgs.stdenv.hostPlatform.isx86;
  virtualisation.hypervGuest.enable = true;
-  services.xe-guest-utilities.enable = true;
+  services.xe-guest-utilities.enable = pkgs.stdenv.hostPlatform.isx86;
  # The VirtualBox guest additions rely on an out-of-tree kernel module
  # which lags behind kernel releases, potentially causing broken builds.
  virtualisation.virtualbox.guest.enable = false;
--- a/nixos/modules/services/networking/mullvad-vpn.nix
+++ b/nixos/modules/services/networking/mullvad-vpn.nix
@ -39,7 +39,7 @@ with lib;
      startLimitBurst = 5;
      startLimitIntervalSec = 20;
      serviceConfig = {
-        ExecStart = "${pkgs.mullvad-vpn}/bin/mullvad-daemon -v --disable-stdout-timestamps";
+        ExecStart = "${pkgs.mullvad}/bin/mullvad-daemon -v --disable-stdout-timestamps";
        Restart = "always";
        RestartSec = 1;
      };
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@ -481,8 +481,8 @@ let
      ++ optional v.allowDiscards "discard"
      ++ optionals v.bypassWorkqueues [ "no-read-workqueue" "no-write-workqueue" ]
      ++ optional (v.header != null) "header=${v.header}"
-      ++ optional (v.keyFileOffset != null) "keyfile-offset=${v.keyFileOffset}"
-      ++ optional (v.keyFileSize != null) "keyfile-size=${v.keyFileSize}"
+      ++ optional (v.keyFileOffset != null) "keyfile-offset=${toString v.keyFileOffset}"
+      ++ optional (v.keyFileSize != null) "keyfile-size=${toString v.keyFileSize}"
    ;
  in "${n} ${v.device} ${if v.keyFile == null then "-" else v.keyFile} ${lib.concatStringsSep "," opts}") luks.devices));

--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@ -4,8 +4,8 @@

 { nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; }
 , stableBranch ? false
-, supportedSystems ? [ "x86_64-linux" ]
-, limitedSupportedSystems ? [ "i686-linux" "aarch64-linux" ]
+, supportedSystems ? [ "aarch64-linux" "x86_64-linux" ]
+, limitedSupportedSystems ? [ "i686-linux" ]
 }:

 let
@ -50,17 +50,17 @@ in rec {
        (onFullSupported "nixos.dummy")
        (onAllSupported "nixos.iso_minimal")
        (onSystems ["x86_64-linux" "aarch64-linux"] "nixos.amazonImage")
-        (onSystems ["x86_64-linux"] "nixos.iso_plasma5")
-        (onSystems ["x86_64-linux"] "nixos.iso_gnome")
+        (onFullSupported "nixos.iso_plasma5")
+        (onFullSupported "nixos.iso_gnome")
        (onFullSupported "nixos.manual")
        (onSystems ["x86_64-linux"] "nixos.ova")
        (onSystems ["aarch64-linux"] "nixos.sd_image")
        (onSystems ["x86_64-linux"] "nixos.tests.boot.biosCdrom")
        (onSystems ["x86_64-linux"] "nixos.tests.boot.biosUsb")
        (onFullSupported "nixos.tests.boot-stage1")
-        (onSystems ["x86_64-linux"] "nixos.tests.boot.uefiCdrom")
-        (onSystems ["x86_64-linux"] "nixos.tests.boot.uefiUsb")
-        (onSystems ["x86_64-linux"] "nixos.tests.chromium")
+        (onFullSupported "nixos.tests.boot.uefiCdrom")
+        (onFullSupported "nixos.tests.boot.uefiUsb")
+        (onFullSupported "nixos.tests.chromium")
        (onFullSupported "nixos.tests.containers-imperative")
        (onFullSupported "nixos.tests.containers-ip")
        (onSystems ["x86_64-linux"] "nixos.tests.docker")
--- a/nixos/release-small.nix
+++ b/nixos/release-small.nix
@ -4,7 +4,7 @@

 { nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; }
 , stableBranch ? false
-, supportedSystems ? [ "x86_64-linux" ] # no i686-linux
+, supportedSystems ? [ "aarch64-linux" "x86_64-linux" ] # no i686-linux
 }:

 let
@ -53,7 +53,8 @@ in rec {
      };
      boot = {
        inherit (nixos'.tests.boot)
-          biosCdrom;
+          biosCdrom
+          uefiCdrom;
      };
    };
  };
@ -83,45 +84,56 @@ in rec {
      vim;
  };

-  tested = pkgs.releaseTools.aggregate {
+  tested = let
+    onSupported = x: map (system: "${x}.${system}") supportedSystems;
+    onSystems = systems: x: map (system: "${x}.${system}")
+      (pkgs.lib.intersectLists systems supportedSystems);
+  in pkgs.releaseTools.aggregate {
    name = "nixos-${nixos.channel.version}";
    meta = {
      description = "Release-critical builds for the NixOS channel";
      maintainers = [ lib.maintainers.eelco ];
    };
-    constituents =
-      [ "nixos.channel"
-        "nixos.dummy.x86_64-linux"
-        "nixos.iso_minimal.x86_64-linux"
-        "nixos.amazonImage.x86_64-linux"
-        "nixos.manual.x86_64-linux"
-        "nixos.tests.boot.biosCdrom.x86_64-linux"
-        "nixos.tests.containers-imperative.x86_64-linux"
-        "nixos.tests.containers-ip.x86_64-linux"
-        "nixos.tests.firewall.x86_64-linux"
-        "nixos.tests.installer.lvm.x86_64-linux"
-        "nixos.tests.installer.separateBoot.x86_64-linux"
-        "nixos.tests.installer.simple.x86_64-linux"
-        "nixos.tests.ipv6.x86_64-linux"
-        "nixos.tests.login.x86_64-linux"
-        "nixos.tests.misc.x86_64-linux"
-        "nixos.tests.nat.firewall-conntrack.x86_64-linux"
-        "nixos.tests.nat.firewall.x86_64-linux"
-        "nixos.tests.nat.standalone.x86_64-linux"
-        # fails with kernel >= 5.15 https://github.com/NixOS/nixpkgs/pull/152505#issuecomment-1005049314
-        #"nixos.tests.nfs3.simple.x86_64-linux"
-        "nixos.tests.openssh.x86_64-linux"
-        "nixos.tests.php.fpm.x86_64-linux"
-        "nixos.tests.php.pcre.x86_64-linux"
-        "nixos.tests.predictable-interface-names.predictable.x86_64-linux"
-        "nixos.tests.predictable-interface-names.predictableNetworkd.x86_64-linux"
-        "nixos.tests.predictable-interface-names.unpredictable.x86_64-linux"
-        "nixos.tests.predictable-interface-names.unpredictableNetworkd.x86_64-linux"
-        "nixos.tests.proxy.x86_64-linux"
-        "nixos.tests.simple.x86_64-linux"
-        "nixpkgs.jdk.x86_64-linux"
+    constituents = lib.flatten [
+      [
+        "nixos.channel"
        "nixpkgs.tarball"
-      ];
+      ]
+      (map (onSystems [ "x86_64-linux" ]) [
+        "nixos.tests.boot.biosCdrom"
+        "nixos.tests.installer.lvm"
+        "nixos.tests.installer.separateBoot"
+        "nixos.tests.installer.simple"
+      ])
+      (map onSupported [
+        "nixos.dummy"
+        "nixos.iso_minimal"
+        "nixos.amazonImage"
+        "nixos.manual"
+        "nixos.tests.boot.uefiCdrom"
+        "nixos.tests.containers-imperative"
+        "nixos.tests.containers-ip"
+        "nixos.tests.firewall"
+        "nixos.tests.ipv6"
+        "nixos.tests.login"
+        "nixos.tests.misc"
+        "nixos.tests.nat.firewall-conntrack"
+        "nixos.tests.nat.firewall"
+        "nixos.tests.nat.standalone"
+        # fails with kernel >= 5.15 https://github.com/NixOS/nixpkgs/pull/152505#issuecomment-1005049314
+        #"nixos.tests.nfs3.simple"
+        "nixos.tests.openssh"
+        "nixos.tests.php.fpm"
+        "nixos.tests.php.pcre"
+        "nixos.tests.predictable-interface-names.predictable"
+        "nixos.tests.predictable-interface-names.predictableNetworkd"
+        "nixos.tests.predictable-interface-names.unpredictable"
+        "nixos.tests.predictable-interface-names.unpredictableNetworkd"
+        "nixos.tests.proxy"
+        "nixos.tests.simple"
+        "nixpkgs.jdk"
+      ])
+    ];
  };

 }
--- a/nixos/release.nix
+++ b/nixos/release.nix
@ -169,13 +169,13 @@ in rec {
    inherit system;
  });

-  iso_plasma5 = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
+  iso_plasma5 = forMatchingSystems supportedSystems (system: makeIso {
    module = ./modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix;
    type = "plasma5";
    inherit system;
  });

-  iso_gnome = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
+  iso_gnome = forMatchingSystems supportedSystems (system: makeIso {
    module = ./modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix;
    type = "gnome";
    inherit system;
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@ -119,7 +119,7 @@ in {
  certmgr = handleTest ./certmgr.nix {};
  cfssl = handleTestOn ["x86_64-linux"] ./cfssl.nix {};
  charliecloud = handleTest ./charliecloud.nix {};
-  chromium = (handleTestOn ["x86_64-linux"] ./chromium.nix {}).stable or {};
+  chromium = (handleTestOn ["aarch64-linux" "x86_64-linux"] ./chromium.nix {}).stable or {};
  cinnamon = handleTest ./cinnamon.nix {};
  cjdns = handleTest ./cjdns.nix {};
  clickhouse = handleTest ./clickhouse.nix {};
@ -634,6 +634,8 @@ in {
  traefik = handleTestOn ["x86_64-linux"] ./traefik.nix {};
  trafficserver = handleTest ./trafficserver.nix {};
  transmission = handleTest ./transmission.nix {};
+  # tracee requires bpf
+  tracee = handleTestOn ["x86_64-linux"] ./tracee.nix {};
  trezord = handleTest ./trezord.nix {};
  trickster = handleTest ./trickster.nix {};
  trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {};
--- a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
+++ b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
@ -7,10 +7,10 @@
 # - VLAN 1 is the connection between the ISP and the router
 # - VLAN 2 is the connection between the router and the client

-import ./make-test-python.nix ({pkgs, ...}: {
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
  name = "systemd-networkd-ipv6-prefix-delegation";
-  meta = with pkgs.lib.maintainers; {
-    maintainers = [ andir ];
+  meta = with lib.maintainers; {
+    maintainers = [ andir hexa ];
  };
  nodes = {

@ -22,26 +22,38 @@ import ./make-test-python.nix ({pkgs, ...}: {
    #
    # Note: On the ISPs device we don't really care if we are using networkd in
    # this example. That being said we can't use it (yet) as networkd doesn't
-    # implement the serving side of DHCPv6. We will use ISC's well aged dhcpd6
-    # for that task.
+    # implement the serving side of DHCPv6. We will use ISC Kea for that task.
    isp = { lib, pkgs, ... }: {
      virtualisation.vlans = [ 1 ];
      networking = {
        useDHCP = false;
        firewall.enable = false;
-        interfaces.eth1.ipv4.addresses = lib.mkForce []; # no need for legacy IP
-        interfaces.eth1.ipv6.addresses = lib.mkForce [
-          { address = "2001:DB8::1"; prefixLength = 64; }
-        ];
+        interfaces.eth1 = lib.mkForce {}; # Don't use scripted networking
+      };
+
+      systemd.network = {
+        enable = true;
+
+        networks = {
+          "eth1" = {
+            matchConfig.Name = "eth1";
+            address = [
+              "2001:DB8::1/64"
+            ];
+            networkConfig.IPForward = true;
+          };
+        };
      };

      # Since we want to program the routes that we delegate to the "customer"
-      # into our routing table we must give dhcpd the required privs.
-      systemd.services.dhcpd6.serviceConfig.AmbientCapabilities =
-        [ "CAP_NET_ADMIN" ];
+      # into our routing table we must provide kea with the required capability.
+      systemd.services.kea-dhcp6-server.serviceConfig = {
+        AmbientCapabilities = [ "CAP_NET_ADMIN" ];
+        CapabilityBoundingSet = [ "CAP_NET_ADMIN" ];
+      };

      services = {
-        # Configure the DHCPv6 server
+        # Configure the DHCPv6 server to hand out both IA_NA and IA_PD.
        #
        # We will hand out /48 prefixes from the subnet 2001:DB8:F000::/36.
        # That gives us ~8k prefixes. That should be enough for this test.
@ -49,31 +61,70 @@ import ./make-test-python.nix ({pkgs, ...}: {
        # Since (usually) you will not receive a prefix with the router
        # advertisements we also hand out /128 leases from the range
        # 2001:DB8:0000:0000:FFFF::/112.
-        dhcpd6 = {
+        kea.dhcp6 = {
          enable = true;
-          interfaces = [ "eth1" ];
-          extraConfig = ''
-            subnet6 2001:DB8::/36 {
-              range6 2001:DB8:0000:0000:FFFF:: 2001:DB8:0000:0000:FFFF::FFFF;
-              prefix6 2001:DB8:F000:: 2001:DB8:FFFF:: /48;
-            }
+          settings = {
+            interfaces-config.interfaces = [ "eth1" ];
+            subnet6 = [ {
+              interface = "eth1";
+              subnet = "2001:DB8:F::/36";
+              pd-pools = [ {
+                prefix = "2001:DB8:F::";
+                prefix-len = 36;
+                delegated-len = 48;
+              } ];
+              pools = [ {
+                pool = "2001:DB8:0000:0000:FFFF::-2001:DB8:0000:0000:FFFF::FFFF";
+              } ];
+            } ];

-            # This is the secret sauce. We have to extract the prefix and the
-            # next hop when commiting the lease to the database.  dhcpd6
-            # (rightfully) has not concept of adding routes to the systems
-            # routing table. It really depends on the setup.
+            # This is the glue between Kea and the Kernel FIB. DHCPv6
+            # rightfully has no concept of setting up a route in your
+            # FIB. This step really depends on your setup.
            #
-            # In a production environment your DHCPv6 server is likely not the
-            # router. You might want to consider BGP, custom NetConf calls, …
-            # in those cases.
-            on commit {
-              set IP = pick-first-value(binary-to-ascii(16, 16, ":", substring(option dhcp6.ia-na, 16, 16)), "n/a");
-              set Prefix = pick-first-value(binary-to-ascii(16, 16, ":", suffix(option dhcp6.ia-pd, 16)), "n/a");
-              set PrefixLength = pick-first-value(binary-to-ascii(10, 8, ":", substring(suffix(option dhcp6.ia-pd, 17), 0, 1)), "n/a");
-              log(concat(IP, " ", Prefix, " ", PrefixLength));
-              execute("${pkgs.iproute2}/bin/ip", "-6", "route", "replace", concat(Prefix,"/",PrefixLength), "via", IP);
-            }
-          '';
+            # In a production environment your DHCPv6 server is likely
+            # not the router. You might want to consider BGP, NETCONF
+            # calls, … in those cases.
+            #
+            # In this example we use the run script hook, that lets use
+            # execute anything and passes information via the environment.
+            # https://kea.readthedocs.io/en/kea-2.2.0/arm/hooks.html#run-script-run-script-support-for-external-hook-scripts
+            hooks-libraries = [ {
+              library = "${pkgs.kea}/lib/kea/hooks/libdhcp_run_script.so";
+              parameters = {
+                name = pkgs.writeShellScript "kea-run-hooks" ''
+                  export PATH="${lib.makeBinPath (with pkgs; [ coreutils iproute2 ])}"
+
+                  set -euxo pipefail
+
+                  leases6_committed() {
+                    for i in $(seq $LEASES6_SIZE); do
+                      idx=$((i-1))
+                      prefix_var="LEASES6_AT''${idx}_ADDRESS"
+                      plen_var="LEASES6_AT''${idx}_PREFIX_LEN"
+
+                      ip -6 route replace ''${!prefix_var}/''${!plen_var} via $QUERY6_REMOTE_ADDR dev $QUERY6_IFACE_NAME
+                    done
+                  }
+
+                  unknown_handler() {
+                    echo "Unhandled function call ''${*}"
+                    exit 123
+                  }
+
+                  case "$1" in
+                      "leases6_committed")
+                          leases6_committed
+                          ;;
+                      *)
+                          unknown_handler "''${@}"
+                          ;;
+                  esac
+                '';
+                sync = false;
+              };
+            } ];
+          };
        };

        # Finally we have to set up the router advertisements. While we could be
--- a/nixos/tests/tracee.nix
+++ b/nixos/tests/tracee.nix
@ -0,0 +1,46 @@
+import ./make-test-python.nix ({ pkgs, ... }: {
+  name = "tracee-integration";
+  nodes = {
+    machine = { config, pkgs, ... }: {
+      # EventFilters/trace_only_events_from_new_containers requires docker
+      # podman with docker compat will suffice
+      virtualisation.podman.enable = true;
+      virtualisation.podman.dockerCompat = true;
+
+      environment.systemPackages = [
+        # build the go integration tests as a binary
+        (pkgs.tracee.overrideAttrs (oa: {
+          pname = oa.pname + "-integration";
+          patches = oa.patches or [] ++ [
+            # change the prefix from /usr/bin to /run to find nix processes
+            ../../pkgs/tools/security/tracee/test-EventFilters-prefix-nix-friendly.patch
+            # skip magic_write test that currently fails
+            ../../pkgs/tools/security/tracee/test-EventFilters-magic_write-skip.patch
+          ];
+          buildPhase = ''
+            runHook preBuild
+            # just build the static lib we need for the go test binary
+            make $makeFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES} bpf-core ./dist/btfhub ./dist/libbpf/libbpf.a
+            # then compile the tests to be ran later
+            CGO_CFLAGS="-I$PWD/dist/libbpf" CGO_LDFLAGS="-lelf -lz $PWD/dist/libbpf/libbpf.a" go test -tags core,ebpf,integration -p 1 -c -o $GOPATH/tracee-integration ./tests/integration/...
+            runHook postBuild
+          '';
+          doCheck = false;
+          installPhase = ''
+            mkdir -p $out/bin
+            cp $GOPATH/tracee-integration $out/bin
+          '';
+          doInstallCheck = false;
+        }))
+      ];
+    };
+  };
+
+  testScript = ''
+    with subtest("run integration tests"):
+      # EventFilters/trace_only_events_from_new_containers also requires a container called "alpine"
+      machine.succeed('tar cv -C ${pkgs.pkgsStatic.busybox} . | podman import - alpine --change ENTRYPOINT=sleep')
+
+      print(machine.succeed('TRC_BIN="${pkgs.tracee}" tracee-integration -test.v'))
+  '';
+})
--- a/pkgs/applications/audio/blanket/default.nix
+++ b/pkgs/applications/audio/blanket/default.nix
@ -4,7 +4,7 @@
 , meson
 , ninja
 , pkg-config
-, wrapGAppsHook
+, wrapGAppsHook4
 , desktop-file-utils
 , appstream-glib
 , python3Packages
@ -30,9 +30,8 @@ python3Packages.buildPythonApplication rec {
    meson
    ninja
    pkg-config
-    wrapGAppsHook
+    wrapGAppsHook4
    desktop-file-utils
-    appstream-glib
  ];

  buildInputs = [
@ -57,6 +56,8 @@ python3Packages.buildPythonApplication rec {

  postPatch = ''
    patchShebangs build-aux/meson/postinstall.py
+    substituteInPlace build-aux/meson/postinstall.py \
+      --replace gtk-update-icon-cache gtk4-update-icon-cache
  '';

  meta = with lib; {
--- a/pkgs/applications/audio/spot/default.nix
+++ b/pkgs/applications/audio/spot/default.nix
@ -16,7 +16,7 @@
 , openssl
 , alsa-lib
 , libpulseaudio
-, wrapGAppsHook
+, wrapGAppsHook4
 }:

 stdenv.mkDerivation rec {
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
    rustPlatform.rust.cargo
    rustPlatform.cargoSetupHook
    rustPlatform.rust.rustc
-    wrapGAppsHook
+    wrapGAppsHook4
  ];

  buildInputs = [
@ -67,6 +67,8 @@ stdenv.mkDerivation rec {
  postPatch = ''
    chmod +x build-aux/cargo.sh
    patchShebangs build-aux/cargo.sh build-aux/meson/postinstall.py
+    substituteInPlace build-aux/meson/postinstall.py \
+      --replace gtk-update-icon-cache gtk4-update-icon-cache
  '';

  passthru = {
--- a/pkgs/applications/blockchains/clightning/default.nix
+++ b/pkgs/applications/blockchains/clightning/default.nix
@ -7,6 +7,7 @@
 , automake
 , gettext
 , libtool
+, lowdown
 , protobuf
 , unzip
 , which
@ -21,30 +22,21 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "clightning";
-  version = "0.12.0";
+  version = "0.12.1";

  src = fetchurl {
    url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
-    sha256 = "1ff400339db3d314b459e1a3e973f1213783e814faa21f2e1b18917693cabfd9";
-  };
-
-  manpages = fetchurl {
-    url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}-manpages.tar.xz";
-    sha256 = "sha256-7EohXp0/gIJwlMsTHwlcLNBzZb8LwF9n0eXkQhOnY7g=";
+    sha256 = "sha256-SlDDOJ6H2UVT/dof23CYSzCliAc+5CAYQc87AzOtYjg=";
  };

  # when building on darwin we need dawin.cctools to provide the correct libtool
  # as libwally-core detects the host as darwin and tries to add the -static
  # option to libtool, also we have to add the modified gsed package.
-  nativeBuildInputs = [ autoconf autogen automake gettext libtool protobuf py3 unzip which ]
+  nativeBuildInputs = [ autoconf autogen automake gettext libtool lowdown protobuf py3 unzip which ]
    ++ lib.optionals stdenv.isDarwin [ darwin.cctools darwin.autoSignDarwinBinariesHook ];

  buildInputs = [ gmp libsodium sqlite zlib ];

-  postUnpack = ''
-    tar -xf $manpages -C $sourceRoot
-  '';
-
  # this causes some python trouble on a darwin host so we skip this step.
  # also we have to tell libwally-core to use sed instead of gsed.
  postPatch = if !stdenv.isDarwin then ''
--- a/pkgs/applications/editors/jetbrains/versions.json
+++ b/pkgs/applications/editors/jetbrains/versions.json
@ -3,47 +3,47 @@
    "clion": {
      "update-channel": "CLion RELEASE",
      "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
-      "version": "2022.2.1",
-      "sha256": "a0d9e77ad4afbb5f7d69e23cf84ccf132eed6ead6c3a7cd442b33924e6931656",
-      "url": "https://download.jetbrains.com/cpp/CLion-2022.2.1.tar.gz",
+      "version": "2022.2.3",
+      "sha256": "e0338107115231c4b354870dfcf537ba6ad1741a0d310e4e50c48dfc24ff9cce",
+      "url": "https://download.jetbrains.com/cpp/CLion-2022.2.3.tar.gz",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.54"
+      "build_number": "222.4167.35"
    },
    "datagrip": {
      "update-channel": "DataGrip RELEASE",
      "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
-      "version": "2022.2.1",
-      "sha256": "4015bfa478f7ee33914975b530f13930bc32eff86223e9256f2610497f95825f",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.1.tar.gz",
+      "version": "2022.2.5",
+      "sha256": "55b28f3b79eda126fe778e2945804d50b1145503737f1b5e25ab6ae2d2a0e3ae",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.5.tar.gz",
      "version-major-minor": "2022.1.1",
-      "build_number": "222.3345.126"
+      "build_number": "222.4345.5"
    },
    "goland": {
      "update-channel": "GoLand RELEASE",
      "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
-      "version": "2022.2.2",
-      "sha256": "c3cfc300f55adc3a52528d13a1133bffd2aa7c2d20ea301cd20e3aff52d87609",
-      "url": "https://download.jetbrains.com/go/goland-2022.2.2.tar.gz",
+      "version": "2022.2.3",
+      "sha256": "fda47d9939b95d8995d1a375443025599cd74b1b5a2966273477ecfafa9ce4f1",
+      "url": "https://download.jetbrains.com/go/goland-2022.2.3.tar.gz",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.57"
+      "build_number": "222.4167.25"
    },
    "idea-community": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
-      "version": "2022.2.1",
-      "sha256": "93eb9391a898aad164ca47965e0445cbf0f04d7062b6875c4e4a3136799ee6cf",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.1.tar.gz",
+      "version": "2022.2.3",
+      "sha256": "4ba5faafad48d58db5099fae080ae2238086d3d9803080082de8efe35d8bf4ed",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.3.tar.gz",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.54"
+      "build_number": "222.4345.14"
    },
    "idea-ultimate": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-no-jbr.tar.gz",
-      "version": "2022.2.1",
-      "sha256": "43eee4b9ea9aed7601252823689e7232b39829784a9bab5e8b5462f55eecc83a",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.1-no-jbr.tar.gz",
+      "version": "2022.2.3",
+      "sha256": "7454d7e0b8f4e3d8d805dde645d28b842101bd77aea8b29125880c592e6b8c85",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.3-no-jbr.tar.gz",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.54"
+      "build_number": "222.4345.14"
    },
    "mps": {
      "update-channel": "MPS RELEASE",
@ -57,103 +57,103 @@
    "phpstorm": {
      "update-channel": "PhpStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
-      "version": "2022.2.1",
-      "sha256": "dc463578e879f958cae3c5fc775170dd0a6a89347c02aa087126f03cc7a63f79",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.1.tar.gz",
+      "version": "2022.2.3",
+      "sha256": "2376cd043bb941524df62db40f9125b1c693be11df80a41fd5b3dd9dcd3446e9",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.3.tar.gz",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.61"
+      "build_number": "222.4345.15"
    },
    "pycharm-community": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
-      "version": "2022.2.1",
-      "sha256": "fc91b134b6899a09ce8cbdc1ebdbdcfe1c1ffb6dbe756b30b24d7ad131bf27c8",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.1.tar.gz",
+      "version": "2022.2.2",
+      "sha256": "2f361c5f59c685c9f8d1385029ed753eabe5b688a82acef6e83a50f0d2b9d7a8",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.2.tar.gz",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.56"
+      "build_number": "222.4167.33"
    },
    "pycharm-professional": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
-      "version": "2022.2.1",
-      "sha256": "a23ffa7b617ab27d3c8abb0689b4d03b5370534193152cd4cfe4196c7d150751",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.1.tar.gz",
+      "version": "2022.2.2",
+      "sha256": "b7bfb86026fba669bb22429ab0840afba5047680202762070cfbb1f181d53d0e",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.2.tar.gz",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.56"
+      "build_number": "222.4167.33"
    },
    "rider": {
      "update-channel": "Rider RELEASE",
      "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
-      "version": "2022.2.1",
-      "sha256": "3f61c5fbdf46b94a5cb772ad51dda5a9cad8a9c7ad78dbcacf01daa2226a5633",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.1.tar.gz",
+      "version": "2022.2.3",
+      "sha256": "2fdff8616fd1574a0ef7baaed855aa39a1254ea164b74d1b4dda11241e58ab2d",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.3.tar.gz",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.37"
+      "build_number": "222.4167.23"
    },
    "ruby-mine": {
      "update-channel": "RubyMine RELEASE",
      "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
-      "version": "2022.2",
-      "sha256": "4300570552fb94932fe4311b6f8c7a071296e0c0c84246039f26f1b37dda9f0a",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.tar.gz",
+      "version": "2022.2.3",
+      "sha256": "a8c3412db30ab7bd8b8601b0a50c95dc48a412391f1c33df27c47cf5d2204257",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.3.tar.gz",
      "version-major-minor": "2022.1",
-      "build_number": "222.3345.111"
+      "build_number": "222.4345.14"
    },
    "webstorm": {
      "update-channel": "WebStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
-      "version": "2022.2.1",
-      "sha256": "508fe7272dd049875d848b52a2908e4d228ce576d4dde5f56f51a8c346b12a2c",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.1.tar.gz",
+      "version": "2022.2.3",
+      "sha256": "1d7d464bbcb83d5af48359aeda6aa7d165038bfaa1f26fef1019761eb278fa22",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.3.tar.gz",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.57"
+      "build_number": "222.4345.14"
    }
  },
  "x86_64-darwin": {
    "clion": {
      "update-channel": "CLion RELEASE",
      "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
-      "version": "2022.2.1",
-      "sha256": "ba2a8fcf9a1f080ca6b2ef832b13104c440077b9e6a2bb6e26bc97bdea373208",
-      "url": "https://download.jetbrains.com/cpp/CLion-2022.2.1.dmg",
+      "version": "2022.2.3",
+      "sha256": "d7e0dcbb3c28f383d1365f5cb6d2b55afbb8c638fd9f100b8040f72b394a1aed",
+      "url": "https://download.jetbrains.com/cpp/CLion-2022.2.3.dmg",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.54"
+      "build_number": "222.4167.35"
    },
    "datagrip": {
      "update-channel": "DataGrip RELEASE",
      "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg",
-      "version": "2022.2.1",
-      "sha256": "7cd7bcdc7588a88459dcda5bab0e7c97751b8d7a87a37c5af8e08072fc9beb03",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.1.dmg",
+      "version": "2022.2.5",
+      "sha256": "cdf0302b0ab65d3dfce4e48004ef45873c9912c844d2e3c82bfe19de2b11cfda",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.5.dmg",
      "version-major-minor": "2022.1.1",
-      "build_number": "222.3345.126"
+      "build_number": "222.4345.5"
    },
    "goland": {
      "update-channel": "GoLand RELEASE",
      "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
-      "version": "2022.2.2",
-      "sha256": "e11f07aebf849ed942c4b8658c11c70ce81b4138186a0301c0ec7cd236f1ff51",
-      "url": "https://download.jetbrains.com/go/goland-2022.2.2.dmg",
+      "version": "2022.2.3",
+      "sha256": "f2e9f2455cf2e13f3b7ed28c18507aa758742c533cb1c07a1ebe62172a939b47",
+      "url": "https://download.jetbrains.com/go/goland-2022.2.3.dmg",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.57"
+      "build_number": "222.4167.25"
    },
    "idea-community": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
-      "version": "2022.2.1",
-      "sha256": "9c1402f8682ecefe84ae9494c65b80da1b763664624a7f6b0104b044b4cb687a",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.1.dmg",
+      "version": "2022.2.3",
+      "sha256": "6ec3721d9961918a14630eaf068765eeba97e71baecd95ec67510dc25c8bd1b1",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.3.dmg",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.54"
+      "build_number": "222.4345.14"
    },
    "idea-ultimate": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
-      "version": "2022.2.1",
-      "sha256": "e54a026da11d05d9bb0172f4ef936ba2366f985b5424e7eecf9e9341804d65bf",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.1.dmg",
+      "version": "2022.2.3",
+      "sha256": "df780c841398532e090adc2c6af35a7fbcdd29fddb37e5a68f33d61a9032d5a3",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.3.dmg",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.54"
+      "build_number": "222.4345.14"
    },
    "mps": {
      "update-channel": "MPS RELEASE",
@ -167,103 +167,103 @@
    "phpstorm": {
      "update-channel": "PhpStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
-      "version": "2022.2.1",
-      "sha256": "ba9cc863c2247e6404b015fac085e8b3427b29aba3d7cb07940840f7c5e3b647",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.1.dmg",
+      "version": "2022.2.3",
+      "sha256": "8dbe5cd8e31c7f6bc6795db6946e2430c82f0aa2c13e7805c40733428b02241d",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.3.dmg",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.61"
+      "build_number": "222.4345.15"
    },
    "pycharm-community": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
-      "version": "2022.2.1",
-      "sha256": "8c2b322cab74cbf52dbe33e0fd9be63fe320d1ade2446790c4eec7309b590eea",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.1.dmg",
+      "version": "2022.2.2",
+      "sha256": "a7fbc83ea01e96c79a75fd061669fa0156b770e92c1153a03681fb67ee4a59ea",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.2.dmg",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.56"
+      "build_number": "222.4167.33"
    },
    "pycharm-professional": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
-      "version": "2022.2.1",
-      "sha256": "6636139dc9c0e28b90517e91d1c1924e218b5d33d9418cca888b05c11fbf54d9",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.1.dmg",
+      "version": "2022.2.2",
+      "sha256": "9b2f5841fa5741881600fbf3b0d5686f2593a6771bb70454d4cb0cc3acd1e43a",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.2.dmg",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.56"
+      "build_number": "222.4167.33"
    },
    "rider": {
      "update-channel": "Rider RELEASE",
      "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
-      "version": "2022.2.1",
-      "sha256": "13cdaa0f83e645a0a08bc3dd05522441e591b247af853b22c8ca5bbce047a125",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.1.dmg",
+      "version": "2022.2.3",
+      "sha256": "aa02c2c621d356486a0b698a45d773f5830ff4ef431940059f82e8d3c17a2335",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.3.dmg",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.37"
+      "build_number": "222.4167.23"
    },
    "ruby-mine": {
      "update-channel": "RubyMine RELEASE",
      "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
-      "version": "2022.2",
-      "sha256": "d806254af68425089d40a7a302ce10c87283a25399e7b667e8d261b3958f4fbb",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.dmg",
+      "version": "2022.2.3",
+      "sha256": "a04700159fcf3bfed74d196edc4c1150e5906dc4730d06ffd017b6bbb9bc853b",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.3.dmg",
      "version-major-minor": "2022.1",
-      "build_number": "222.3345.111"
+      "build_number": "222.4345.14"
    },
    "webstorm": {
      "update-channel": "WebStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
-      "version": "2022.2.1",
-      "sha256": "7d57692ce83dd6c853c80c457bdb8239dd833cf5535c600154a7ebc0be18a05d",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.1.dmg",
+      "version": "2022.2.3",
+      "sha256": "e6532a9a840c3508cdf26511200fbba34ec9a275154d717538019f72ebc5fc51",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.3.dmg",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.57"
+      "build_number": "222.4345.14"
    }
  },
  "aarch64-darwin": {
    "clion": {
      "update-channel": "CLion RELEASE",
      "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
-      "version": "2022.2.1",
-      "sha256": "af36f7f9a98881d37d89757083875494c472e60d14bd70fe0d08533d284dd4e1",
-      "url": "https://download.jetbrains.com/cpp/CLion-2022.2.1-aarch64.dmg",
+      "version": "2022.2.3",
+      "sha256": "d921c83ee6b444520e7fdb9fdae4ec0e67cea6dfcaa720e6b36d85c17a4df39c",
+      "url": "https://download.jetbrains.com/cpp/CLion-2022.2.3-aarch64.dmg",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.54"
+      "build_number": "222.4167.35"
    },
    "datagrip": {
      "update-channel": "DataGrip RELEASE",
      "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg",
-      "version": "2022.2.1",
-      "sha256": "01d8de1225fb4a74f22752edf74038405f02d27565f01816d8e751d7989a75bb",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.1-aarch64.dmg",
+      "version": "2022.2.5",
+      "sha256": "8ff78e440e4753adc8dbd4ee408fde114f7d9c65ee780f012b917498b63993ee",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.5-aarch64.dmg",
      "version-major-minor": "2022.1.1",
-      "build_number": "222.3345.126"
+      "build_number": "222.4345.5"
    },
    "goland": {
      "update-channel": "GoLand RELEASE",
      "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
-      "version": "2022.2.2",
-      "sha256": "7098f05847c0524bc90b00766c71c2f1cc1442983da956c79ee1445b48da73fd",
-      "url": "https://download.jetbrains.com/go/goland-2022.2.2-aarch64.dmg",
+      "version": "2022.2.3",
+      "sha256": "c3c790a45b36af006f743a70fb114782a9c4a2076d025de65894d0f39b0f48a5",
+      "url": "https://download.jetbrains.com/go/goland-2022.2.3-aarch64.dmg",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.57"
+      "build_number": "222.4167.25"
    },
    "idea-community": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
-      "version": "2022.2.1",
-      "sha256": "4bf843152fe009838dbb5e5a1d8e39ebf98df5f6771254cf1f26ff0b299798fd",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.1-aarch64.dmg",
+      "version": "2022.2.3",
+      "sha256": "333c70caf452034ae332cdded4d24a71592049b4045725eb57826a0b997d1c7a",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.3-aarch64.dmg",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.54"
+      "build_number": "222.4345.14"
    },
    "idea-ultimate": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
-      "version": "2022.2.1",
-      "sha256": "f7b56525adf96d0ac290eebebd08a53b962a799db65942e07cd437aef655fa0e",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.1-aarch64.dmg",
+      "version": "2022.2.3",
+      "sha256": "9e5c32fffd17d651d8d875c2588a067902a9ebb9bf815d06aabfd75b9f4ee3cd",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.3-aarch64.dmg",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.54"
+      "build_number": "222.4345.14"
    },
    "mps": {
      "update-channel": "MPS RELEASE",
@ -277,56 +277,56 @@
    "phpstorm": {
      "update-channel": "PhpStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
-      "version": "2022.2.1",
-      "sha256": "b553e1f0249b4d7f89cacdac7bada758895cd35aec8ddac5f81017f61ddc44fb",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.1-aarch64.dmg",
+      "version": "2022.2.3",
+      "sha256": "0dee8fe654cccdafa73b65da1a2ef844401a9438ecee726fe6f6af1f09d07c38",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.3-aarch64.dmg",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.61"
+      "build_number": "222.4345.15"
    },
    "pycharm-community": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
-      "version": "2022.2.1",
-      "sha256": "c3abc618614be830dbf41479b74ae489aa44290d9bbb11e3c4d2cdffb4d569b6",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.1-aarch64.dmg",
+      "version": "2022.2.2",
+      "sha256": "8a6f1440cfc9aa47a89a8dda7d19bf50c9790fc12153f97d11e975327703d6e0",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.2-aarch64.dmg",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.56"
+      "build_number": "222.4167.33"
    },
    "pycharm-professional": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
-      "version": "2022.2.1",
-      "sha256": "416ca961042b9c3ae8b23039cc3b84b64e941c1d82478bca3e327089efa4f4d2",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.1-aarch64.dmg",
+      "version": "2022.2.2",
+      "sha256": "30915c13c4ba2907f083dfa092bc3734e98a4ab83e2180221e52b9b04a93a1e2",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.2-aarch64.dmg",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.56"
+      "build_number": "222.4167.33"
    },
    "rider": {
      "update-channel": "Rider RELEASE",
      "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
-      "version": "2022.2.1",
-      "sha256": "96e539ba43d7dcecb9e709c1b1483b4c832fbff4b9fd77f6e91b266a91125a55",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.1-aarch64.dmg",
+      "version": "2022.2.3",
+      "sha256": "5dd892ed16dd1bc819a97ffb62cdfbb3b60c6019581ba18358afc5c0a39585f5",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.3-aarch64.dmg",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.37"
+      "build_number": "222.4167.23"
    },
    "ruby-mine": {
      "update-channel": "RubyMine RELEASE",
      "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
-      "version": "2022.2",
-      "sha256": "c7650443f16ab9cc0b3f6fc701164633bab079f11eeb7aa93b78f2ddc73640a0",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2-aarch64.dmg",
+      "version": "2022.2.3",
+      "sha256": "cd7a967c2745aca566569a320eb276773638d05fcd25839db18a098803d2c5f4",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.3-aarch64.dmg",
      "version-major-minor": "2022.1",
-      "build_number": "222.3345.111"
+      "build_number": "222.4345.14"
    },
    "webstorm": {
      "update-channel": "WebStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
-      "version": "2022.2.1",
-      "sha256": "fa790240b0d00cb134bf0e87c6a85d5a749b73b3f577a9564a890e5819926e53",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.1-aarch64.dmg",
+      "version": "2022.2.3",
+      "sha256": "7ffd746e5e33f2d69f7b8c39920f67de149f183a0d372d20f3f6bc4febf2e355",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.3-aarch64.dmg",
      "version-major-minor": "2022.1",
-      "build_number": "222.3739.57"
+      "build_number": "222.4345.14"
    }
  }
 }
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -341,12 +341,12 @@ final: prev:

  SpaceVim = buildVimPluginFrom2Nix {
    pname = "SpaceVim";
-    version = "2022-10-10";
+    version = "2022-10-11";
    src = fetchFromGitHub {
      owner = "SpaceVim";
      repo = "SpaceVim";
-      rev = "3bacbcd4ef84d24602799555465fed6d71fdd9b2";
-      sha256 = "1mhq6gz0maab2vvrajdcq689nr93sniw5iz75spr8vq9za9aazx0";
+      rev = "1ed769feb2a13061be69563cc42d686ac44fc441";
+      sha256 = "0naxqvxm8dwi7hbphbl04kaphhxpq1x2f3n9whdhj7rbnq7m6r9h";
    };
    meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
  };
@ -2010,24 +2010,24 @@ final: prev:

  coq-artifacts = buildVimPluginFrom2Nix {
    pname = "coq.artifacts";
-    version = "2022-10-10";
+    version = "2022-10-11";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq.artifacts";
-      rev = "e7ce839707e349fa5d8ea494dae2490fa849a4c3";
-      sha256 = "0g10avvx8i7pgfipq2wbylk98r1xz3g1sqr4kldxkv2g48842c1v";
+      rev = "80ec4396170f63041d8d7e8d2df3c54eb45300f7";
+      sha256 = "13h2nib9amjjsx35gsxfcvyx674m04wrsp4fia06ksa40h8hadkm";
    };
    meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
  };

  coq-thirdparty = buildVimPluginFrom2Nix {
    pname = "coq.thirdparty";
-    version = "2022-10-10";
+    version = "2022-10-11";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq.thirdparty";
-      rev = "9f0744543875c3bee9c124248d259d059ccdad21";
-      sha256 = "0ykh3xl37x07z9ci63rvxqp1p3sw42macl0jxskbpk338rdvw9yi";
+      rev = "adfb5c498f9d6d7f3b74baaae228ab6dcf923ecb";
+      sha256 = "19l9g3j0pn3l4rndx38fpi82ypgbm0087gwyczj6dbvszld3ln78";
    };
    meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
  };
@ -2046,12 +2046,12 @@ final: prev:

  coq_nvim = buildVimPluginFrom2Nix {
    pname = "coq_nvim";
-    version = "2022-10-10";
+    version = "2022-10-11";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq_nvim";
-      rev = "cbe678af3d43772781781fa485137ea3c46ce323";
-      sha256 = "1dc6903m9qs3s9jpc676lg6970w8vb635w6mc4w72zcln8xgih56";
+      rev = "550149d751f8d62ad646d38ef57b87f4d960bceb";
+      sha256 = "1y5achbd4vkq0fhsh9hvgnb4qh42k3mskii7x6vrnr3vr3gvy0ff";
    };
    meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
  };
@ -3381,6 +3381,18 @@ final: prev:
    meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
  };

+  guess-indent-nvim = buildVimPluginFrom2Nix {
+    pname = "guess-indent.nvim";
+    version = "2022-07-17";
+    src = fetchFromGitHub {
+      owner = "nmac427";
+      repo = "guess-indent.nvim";
+      rev = "c37467baa1a51b74ed767cbe0540fce44e03d828";
+      sha256 = "11fb9xsaq9ygl7sd7k1xg4ccbynmjdvnrbs44snp4q48fidn1vrb";
+    };
+    meta.homepage = "https://github.com/nmac427/guess-indent.nvim/";
+  };
+
  gundo-vim = buildVimPluginFrom2Nix {
    pname = "gundo.vim";
    version = "2021-02-21";
@ -4378,12 +4390,12 @@ final: prev:

  lua-dev-nvim = buildVimPluginFrom2Nix {
    pname = "lua-dev.nvim";
-    version = "2022-10-10";
+    version = "2022-10-11";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "lua-dev.nvim";
-      rev = "092306391310e0cd3b8785588c50d03a9c98d473";
-      sha256 = "0hg6mq5h6a63vnvpxjjyfx1czjj14gpjdc0cn18hnch9krr5mz1i";
+      rev = "34858064f55295557a377b88aebccc9965869cf8";
+      sha256 = "1dvwzsa3002yaff0rcjkfzgzv3r96192kh0b9skg53z44nyvawcw";
    };
    meta.homepage = "https://github.com/folke/lua-dev.nvim/";
  };
@ -5259,8 +5271,8 @@ final: prev:
    src = fetchFromGitHub {
      owner = "jose-elias-alvarez";
      repo = "null-ls.nvim";
-      rev = "ce85d7738b5a29c910a970fed3299bada855fb3d";
-      sha256 = "0gnz4w8yj2d8qzx63dfyvr18sxhid3876gdaf33p0j3x138d45p1";
+      rev = "17e81c1c1f21f8f6d11a4141a490a0b37974a52b";
+      sha256 = "0l8lkrcbyvlkjv18fvi6jk13s9dj5in8h9f0izx1xpk6cdarx7cb";
    };
    meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
  };
@ -5375,12 +5387,12 @@ final: prev:

  nvim-cmp = buildNeovimPluginFrom2Nix {
    pname = "nvim-cmp";
-    version = "2022-10-10";
+    version = "2022-10-11";
    src = fetchFromGitHub {
      owner = "hrsh7th";
      repo = "nvim-cmp";
-      rev = "0ad2450ff617a3568cc3f5e46f13635ef5185e6c";
-      sha256 = "1fgl908sv4pzqg6z4i584d86qqkf91igd0pkhggwf951x0ss4m02";
+      rev = "53bd5749011c0830d54d9b22a37259651d5916df";
+      sha256 = "1fbhbb0aakjs7zwdllzpcydz41nanxyw271ix18h9j47a4x12lq6";
    };
    meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
  };
@ -5481,6 +5493,18 @@ final: prev:
    meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
  };

+  nvim-dap-python = buildVimPluginFrom2Nix {
+    pname = "nvim-dap-python";
+    version = "2022-10-09";
+    src = fetchFromGitHub {
+      owner = "mfussenegger";
+      repo = "nvim-dap-python";
+      rev = "408186a9d1e03e078e3603af912f9e264ceb2742";
+      sha256 = "131a8m5ngxlpbx2b9syksmcci7fff03naw56z7djkvs1w6zh4ln4";
+    };
+    meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/";
+  };
+
  nvim-dap-ui = buildVimPluginFrom2Nix {
    pname = "nvim-dap-ui";
    version = "2022-10-06";
@ -5891,24 +5915,24 @@ final: prev:

  nvim-tree-lua = buildVimPluginFrom2Nix {
    pname = "nvim-tree.lua";
-    version = "2022-10-09";
+    version = "2022-10-10";
    src = fetchFromGitHub {
      owner = "nvim-tree";
      repo = "nvim-tree.lua";
-      rev = "875d38e52cc4367bad10e648a906a6bd73b3691c";
-      sha256 = "02mqgphmmpvnwqaivy4yjgvwrhf23s1jb8z8qldgfxypf5lfpgvl";
+      rev = "b01e7beaa6f0dbbf5df775cf4ecc829a23f0be54";
+      sha256 = "0bmzwgycrp6wcn8kd2h1kwl0ysazmzd36fvi12x2c99yxnassxvi";
    };
    meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
  };

  nvim-treesitter = buildVimPluginFrom2Nix {
    pname = "nvim-treesitter";
-    version = "2022-10-09";
+    version = "2022-10-10";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter";
-      rev = "7ddc2b54db9b92846292e081a337dce2ed4f66a1";
-      sha256 = "195qckaq6xiixh1m2h306c43mf09nfk5p840k2amdbg0i2wi44na";
+      rev = "6840b3740da5497730136c875e8f89cad314657b";
+      sha256 = "1yl9gjdv059xjnzfcqd1mh4icdxr6dyay694gi3g9jbg3pi3djg8";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
  };
@ -6131,12 +6155,12 @@ final: prev:

  onedark-vim = buildVimPluginFrom2Nix {
    pname = "onedark.vim";
-    version = "2022-10-03";
+    version = "2022-10-10";
    src = fetchFromGitHub {
      owner = "joshdick";
      repo = "onedark.vim";
-      rev = "0c23bb090f14580c924323ef1d3ccb1f9d2fa001";
-      sha256 = "1fylkscj2iz4p89807xzzaj21lqi6621afsa8p3pms5vcn0hi8jm";
+      rev = "b6b5ffe31a195a3077338d7a506b905e4a51590f";
+      sha256 = "0mw0z6z33xrxs5yp5d2jm8wvrlicj084gmw858sbx9d9ph4sdyj3";
    };
    meta.homepage = "https://github.com/joshdick/onedark.vim/";
  };
@ -12802,6 +12826,18 @@ final: prev:
    meta.homepage = "https://github.com/vimwiki/vimwiki/";
  };

+  virtual-types-nvim = buildVimPluginFrom2Nix {
+    pname = "virtual-types.nvim";
+    version = "2022-03-17";
+    src = fetchFromGitHub {
+      owner = "jubnzv";
+      repo = "virtual-types.nvim";
+      rev = "31da847fa54b801f309a08123935626adda4aaad";
+      sha256 = "0kqg29xld064fz1xly1kc7wcyck62q5hjkb5fc5vrj0zdnrdzz22";
+    };
+    meta.homepage = "https://github.com/jubnzv/virtual-types.nvim/";
+  };
+
  vis = buildVimPluginFrom2Nix {
    pname = "vis";
    version = "2013-04-26";
@ -13105,12 +13141,12 @@ final: prev:

  catppuccin-nvim = buildVimPluginFrom2Nix {
    pname = "catppuccin-nvim";
-    version = "2022-10-10";
+    version = "2022-10-11";
    src = fetchFromGitHub {
      owner = "catppuccin";
      repo = "nvim";
-      rev = "9991ede2bc5714abfdca7eaf5b20be429502ffe4";
-      sha256 = "10w5q3v91swm538rczncvpzmph01rvpzvwv3zi5la6hbkz5qab8y";
+      rev = "e4ff2a69844f02ef3ee88ca5c5766eb4c7cf0c0c";
+      sha256 = "1xb161q8zmb52x1y8v6fvc5snlf47jxwnyams46xq2q2k8x4sjl6";
    };
    meta.homepage = "https://github.com/catppuccin/nvim/";
  };
@ -13129,12 +13165,12 @@ final: prev:

  chad = buildVimPluginFrom2Nix {
    pname = "chad";
-    version = "2022-10-10";
+    version = "2022-10-11";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "chadtree";
-      rev = "caab879af5f52cdfc673ebd2aff2fb099cf538e1";
-      sha256 = "0rb89dlil2lv8cf7x2vsqfvh0ba7mr5rfwyzx8ln7h8bj56hnx5i";
+      rev = "5375b996a54214d43065017ea06092929d670e9b";
+      sha256 = "0dcqxaz2fa2dp1bpq6schdzr4mhm3nckcmaaa9bn213xxa9dv1in";
    };
    meta.homepage = "https://github.com/ms-jpq/chadtree/";
  };
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -628,6 +628,10 @@ self: super: {
    dependencies = with self; [ plenary-nvim ];
  });

+  nvim-dap-python = super.nvim-dap-python.overrideAttrs (old: {
+    dependencies = with self; [ nvim-dap ];
+  });
+
  nvim-lsputils = super.nvim-lsputils.overrideAttrs (old: {
    dependencies = with self; [ popfix ];
  });
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -283,6 +283,7 @@ https://github.com/morhetz/gruvbox/,,
 https://github.com/eddyekofo94/gruvbox-flat.nvim/,,
 https://github.com/sainnhe/gruvbox-material/,,
 https://github.com/ellisonleao/gruvbox.nvim/,,
+https://github.com/nmac427/guess-indent.nvim/,HEAD,
 https://github.com/sjl/gundo.vim/,,
 https://github.com/junegunn/gv.vim/,,
 https://git.sr.ht/~sircmpwn/hare.vim,HEAD,
@ -461,6 +462,7 @@ https://github.com/roxma/nvim-completion-manager/,,
 https://github.com/klen/nvim-config-local/,,
 https://github.com/yamatsum/nvim-cursorline/,,
 https://github.com/mfussenegger/nvim-dap/,,
+https://github.com/mfussenegger/nvim-dap-python/,HEAD,
 https://github.com/rcarriga/nvim-dap-ui/,,
 https://github.com/theHamsta/nvim-dap-virtual-text/,,
 https://github.com/allendang/nvim-expand-expr/,,
@ -1074,6 +1076,7 @@ https://github.com/puremourning/vimspector/,,
 https://github.com/lervag/vimtex/,,
 https://github.com/preservim/vimux/,,
 https://github.com/vimwiki/vimwiki/,,
+https://github.com/jubnzv/virtual-types.nvim/,HEAD,
 https://github.com/vim-scripts/vis/,,
 https://github.com/navicore/vissort.vim/,,
 https://github.com/liuchengxu/vista.vim/,,
--- a/pkgs/applications/graphics/image-roll/default.nix
+++ b/pkgs/applications/graphics/image-roll/default.nix
@ -3,7 +3,7 @@
 , fetchFromGitHub
 , glib
 , pkg-config
-, wrapGAppsHook
+, wrapGAppsHook4
 , gtk4
 }:

@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {

  cargoSha256 = "sha256-cUE2IZOunR/NIo/qytORRfNqCsf87LfpKA8o/v4Nkhk=";

-  nativeBuildInputs = [ glib pkg-config wrapGAppsHook ];
+  nativeBuildInputs = [ glib pkg-config wrapGAppsHook4 ];

  buildInputs = [ gtk4 ];

@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
    "--skip=file_list::tests"

    # sometimes fails on darwin
-    "image_list::tests::save_current_image_overwrites_image_at_current_image_path_when_filename_is_set_to_none"
+    "--skip=image_list::tests::save_current_image_overwrites_image_at_current_image_path_when_filename_is_set_to_none"
  ];

  postInstall = ''
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@ -2,7 +2,7 @@
 , xdg-utils, zip, unzip, gzip, bzip2, gnutar, p7zip, xz
 , IOKit, Carbon, Cocoa, AudioToolbox, OpenGL
 , withTTYX ? true, libX11
-, withGUI ? true, wxGTK30, wxmac
+, withGUI ? true, wxGTK32
 , withUCD ? true, libuchardet

 # Plugins
@ -12,18 +12,15 @@
 , withPython ? false, python3Packages
 }:

-let
-  wxWidgets = (if stdenv.isDarwin then wxmac else wxGTK30);
-in
 stdenv.mkDerivation rec {
  pname = "far2l";
-  version = "2.4.0";
+  version = "2.4.1";

  src = fetchFromGitHub {
    owner = "elfmz";
    repo = "far2l";
    rev = "v_${version}";
-    sha256 = "sha256-nfoAElPLQ97lj65MBX4JMEdgTFbkdEbR1BazYZgV/lg=";
+    sha256 = "sha256-0t1ND6LmDcivfrZ8RaEr1vjeS5JtaeWkoHkl2e7Xr5s=";
  };

  patches = [ ./python_prebuild.patch ];
@ -31,7 +28,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ cmake ninja pkg-config m4 makeWrapper ];

  buildInputs = lib.optional withTTYX libX11
-    ++ lib.optional withGUI wxWidgets
+    ++ lib.optional withGUI wxGTK32
    ++ lib.optional withUCD libuchardet
    ++ lib.optionals withColorer [ spdlog xercesc ]
    ++ lib.optionals withMultiArc [ libarchive pcre ]
@ -73,7 +70,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "Linux port of FAR Manager v2, a program for managing files and archives in Windows operating systems";
    homepage = "https://github.com/elfmz/far2l";
-    license = licenses.gpl2Plus; # NOTE: might change in far2l repo soon, check next time
+    license = licenses.gpl2Only;
    maintainers = with maintainers; [ hypersw ];
    platforms = platforms.unix;
  };
--- a/pkgs/applications/misc/mangal/default.nix
+++ b/pkgs/applications/misc/mangal/default.nix
@ -2,17 +2,17 @@

 buildGoModule rec {
  pname = "mangal";
-  version = "3.11.0";
+  version = "3.12.0";

  src = fetchFromGitHub {
    owner = "metafates";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-gBHNB3s7RHHxlxgeUFmxOdYvPaI78AzL4vRaCmXKgus=";
+    hash = "sha256-1fWy7riInrbReQ0sQ1TF8GhqWQG0KXk1JzhmxlSuvmk=";
  };

  proxyVendor = true;
-  vendorSha256 = "sha256-dHwookjeF8U/2i0Totho0HY7FdOr/jABmqlQelthc6E=";
+  vendorSha256 = "sha256-+HDuGSZinotUtCqffrmFkjHegxdArSJMWwnUG/tnLRc=";

  ldflags = [ "-s" "-w" ];

--- a/pkgs/applications/misc/survex/default.nix
+++ b/pkgs/applications/misc/survex/default.nix
@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchurl
+, fetchpatch
 , Carbon
 , Cocoa
 , ffmpeg
@ -12,14 +13,26 @@
 , proj
 , python3
 , wrapGAppsHook
-, wxGTK30-gtk3
-, wxmac
+, wxGTK32
 , xlibsWrapper
 }:

 stdenv.mkDerivation rec {
  pname = "survex";
-  version = "1.4.1";
+  version = "1.4.3";
+
+  src = fetchurl {
+    url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz";
+    hash = "sha256-7NtGTe9xNRPEvG9fQ2fC6htQLEMHfqGmBM2ezhi6oNM=";
+  };
+
+  patches = [
+    # Fix cavern.tst to work with SOURCE_DATE_EPOCH set
+    (fetchpatch {
+      url = "https://github.com/ojwb/survex/commit/b1200a60be7bdea20ffebbd8bb15386041727fa6.patch";
+      hash = "sha256-OtFjqpU+u8XGy+PAHg2iea++b681p/Kl8YslisBs4sA=";
+    })
+  ];

  nativeBuildInputs = [
    perl
@ -34,20 +47,14 @@ stdenv.mkDerivation rec {
    libGLU
    mesa
    proj
+    wxGTK32
  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
    Carbon
    Cocoa
-    wxmac
  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    wxGTK30-gtk3
    xlibsWrapper
  ];

-  src = fetchurl {
-    url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz";
-    hash = "sha256-69X1jGjBTQIQzkD1mTZTzE8L/GXnnf5SI52l7eIiLz4=";
-  };
-
  postPatch = ''
    patchShebangs .
  '';
--- a/pkgs/applications/misc/tandoor-recipes/common.nix
+++ b/pkgs/applications/misc/tandoor-recipes/common.nix
@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "1.4.1";
+  version = "1.4.4";

  src = fetchFromGitHub {
    owner = "TandoorRecipes";
    repo = "recipes";
    rev = version;
-    sha256 = "sha256-Q/IwjSByCUXVYxhk3U7oWvlMxrJxyajhpsRyq67PVHY=";
+    sha256 = "sha256-1wqZoOT2Aafbs2P0mL33jw5HkrLIitUcRt6bQQcHx40=";
  };

  yarnSha256 = "sha256-gH0q3pJ2BC5pAU9KSo3C9DDRUnpypoyLOEqKSrkxYrk=";
--- a/pkgs/applications/misc/tandoor-recipes/default.nix
+++ b/pkgs/applications/misc/tandoor-recipes/default.nix
@ -112,6 +112,9 @@ python.pkgs.pythonPackages.buildPythonPackage rec {
    makeWrapper $out/lib/tandoor-recipes/manage.py $out/bin/tandoor-recipes \
      --prefix PYTHONPATH : "$PYTHONPATH"

+    # usually copied during frontend build (see vue.config.js)
+    cp vue/src/sw.js $out/lib/tandoor-recipes/cookbook/templates/
+
    runHook postInstall
  '';

--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@ -1,8 +1,8 @@
 {
  "stable": {
-    "version": "106.0.5249.91",
-    "sha256": "16jlwzlfqdhhyajsxxrdfcqmh76ds8g1w4xd5mz3bdbd81mljh2p",
-    "sha256bin64": "1cfhsar79f319417cx4blcg5hk7b7ix45r7vhrbbwla18p0jij5y",
+    "version": "106.0.5249.103",
+    "sha256": "0k2f3hc6mdmwzw9zzwcv6pnpibdz47a3xxkhfcvdki5gbag6cpr2",
+    "sha256bin64": "0bg6d9fv3ha7iql17nj8h22klbs3ls2nlvabczhh067mh3fpzf5x",
    "deps": {
      "gn": {
        "version": "2022-08-11",
@ -19,9 +19,9 @@
    }
  },
  "beta": {
-    "version": "107.0.5304.18",
-    "sha256": "0d3px8300zvimrp3k9vqaw1ivcizmlxs635gyb8sfrc4gvng29wm",
-    "sha256bin64": "1p06mmv7azivx8zhh4sgffblq9j3rgjvpjfsz5b6li9mlwqg72rq",
+    "version": "107.0.5304.29",
+    "sha256": "1gid36r4hdl3wg2dbdvp847vnzggd2jga4i3pl5mdnvd3f1z0jpd",
+    "sha256bin64": "039b1yc5x5xgfj8sbc843lpizgmrkppcnmdzqq36zgihhj4mqkrg",
    "deps": {
      "gn": {
        "version": "2022-09-14",
@ -32,15 +32,15 @@
    }
  },
  "dev": {
-    "version": "108.0.5327.0",
-    "sha256": "14g164khca0k5q0b5hgy790s5krfs5xxm08gqvs3jg5dn8w4pzvd",
-    "sha256bin64": "08nmikr06qlmfr0jx4jclid1wlb0iqy467c5jn67z033ym7ff1dy",
+    "version": "108.0.5343.2",
+    "sha256": "1xg982z01zrv2lfr5qygn4391906m1z3ksi7k1l0i86g777f0ahg",
+    "sha256bin64": "0pgk3hsw1dxd6z63gpgx5ivjq49lyk608rkidp8i0acmwrvf0fqm",
    "deps": {
      "gn": {
-        "version": "2022-09-16",
+        "version": "2022-10-05",
        "url": "https://gn.googlesource.com/gn",
-        "rev": "cc28efe62ef0c2fb32455f414a29c4a55bb7fbc4",
-        "sha256": "0vibz1v6p88mr7is2nz6ir9x3zlx4vphciwv2awjrb5nhwabz9dg"
+        "rev": "b9c6c19be95a3863e02f00f1fe403b2502e345b6",
+        "sha256": "1rhadb6qk867jafr85x2m3asis3jv7x06blhmad2d296p26d5w6x"
      }
    }
  },
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@ -49,15 +49,9 @@ in
 rec {
  mkKops = generic;

-  kops_1_22 = mkKops rec {
-    version = "1.22.4";
-    sha256 = "sha256-osU7yI77ZALGrAGuP8qAgv+ogDRn+BSVmcjPbi/WEKE=";
-    rev = "v${version}";
-  };
-
  kops_1_23 = mkKops rec {
-    version = "1.23.2";
-    sha256 = "sha256-9GANjGRS9QaJw+CEeMv/f+rEu37QV2YxMvSRSH6+3PM=";
+    version = "1.23.4";
+    sha256 = "sha256-hUj/kUyaqo8q3SJTkd5+9Ld8kfE8wCYNJ2qIATjXqhU=";
    rev = "v${version}";
  };

@ -67,4 +61,9 @@ rec {
    rev = "v${version}";
  };

+  kops_1_25 = mkKops rec {
+    version = "1.25.1";
+    sha256 = "sha256-wKmEdcORXBKQ1AjYr0tNimxs//tSNPO3VQpEPC2mieA=";
+    rev = "v${version}";
+  };
 }
--- a/pkgs/applications/networking/cluster/talosctl/default.nix
+++ b/pkgs/applications/networking/cluster/talosctl/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "talosctl";
-  version = "1.2.4";
+  version = "1.2.5";

  src = fetchFromGitHub {
    owner = "siderolabs";
    repo = "talos";
    rev = "v${version}";
-    sha256 = "sha256-nAT9tn/YfivM25xBL3POgdAF87MB/J2HQfcFOeCEj2o=";
+    sha256 = "sha256-XCfT2uSYFszxxj9JS9A+nnFX6gz3gY03xokjoH3/kVA=";
  };

-  vendorSha256 = "sha256-b9F7P6WRdJywRNQdFY+SJqYxic2W/HrIEYhvCLo3Lok=";
+  vendorSha256 = "sha256-DVrGpWtHiWWDx4fCpA7fBGr8r+OUzworpwHcK0jj3AY=";

  ldflags = [ "-s" "-w" ];

--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -75,13 +75,13 @@
    "version": "2.2.0"
  },
  "auth0": {
-    "hash": "sha256-0y7sS03/cvO49jo4IY+xyh3dYZYcHOTlbCV1JBiYZQ4=",
+    "hash": "sha256-xe9BWrkuQqmwjUy3ys7M3IWJjqZiWkox9NYmsH3VHJ8=",
    "owner": "auth0",
    "provider-source-address": "registry.terraform.io/auth0/auth0",
    "repo": "terraform-provider-auth0",
-    "rev": "v0.37.1",
-    "vendorHash": "sha256-8mGbTkAf42YQ5kKQmC0qSS8lj6Bd/KzpyX3MtS9r6Fk=",
-    "version": "0.37.1"
+    "rev": "v0.38.0",
+    "vendorHash": "sha256-e5mQ3NrWdFeyIjh38YbTd9fRVuxJB6FPmw7xNlEHzGY=",
+    "version": "0.38.0"
  },
  "avi": {
    "hash": "sha256-BQ4M1e7wWDCq2HEJIoAAqSUmq9hV66auvH47p3j2M8I=",
@ -304,13 +304,13 @@
    "version": "0.0.3"
  },
  "digitalocean": {
-    "hash": "sha256-FnVmkHNMuWF01eSOCMyPQescyao/cyUjXwimwYU5gqY=",
+    "hash": "sha256-iLwAkmzKRY8NfUHVGcstIHlSnZY+oi7fhCNP2kCzIxM=",
    "owner": "digitalocean",
    "provider-source-address": "registry.terraform.io/digitalocean/digitalocean",
    "repo": "terraform-provider-digitalocean",
-    "rev": "v2.22.3",
+    "rev": "v2.23.0",
    "vendorHash": null,
-    "version": "2.22.3"
+    "version": "2.23.0"
  },
  "dme": {
    "hash": "sha256-QNkr+6lKlKY+os0Pf6dqlmIn9u2LtMOo6ONahDeA9mE=",
@ -441,24 +441,24 @@
    "version": "3.18.0"
  },
  "google": {
-    "hash": "sha256-b2U4bViukaGXcbkhSpE57dH0w45jUL5TSF2/pdmqqQY=",
+    "hash": "sha256-tjcG23chJwuaf/SRD6Kqz49fdWFKMaVygg/FGydaSR8=",
    "owner": "hashicorp",
    "provider-source-address": "registry.terraform.io/hashicorp/google",
    "proxyVendor": true,
    "repo": "terraform-provider-google",
-    "rev": "v4.39.0",
+    "rev": "v4.40.0",
    "vendorHash": "sha256-PWSok1sTU/57Xeri4Un5B9Fbwg8gBP6Quy5oIZrjxUI=",
-    "version": "4.39.0"
+    "version": "4.40.0"
  },
  "google-beta": {
-    "hash": "sha256-iYNolS1tvlsa0C/UX4xbtOVhGz8wkpit8z2sPSk22a0=",
+    "hash": "sha256-U27ZzjNMFP/TCpXrU0QQ0uYB0sgeWVmRrQFIzq7FAhs=",
    "owner": "hashicorp",
    "provider-source-address": "registry.terraform.io/hashicorp/google-beta",
    "proxyVendor": true,
    "repo": "terraform-provider-google-beta",
-    "rev": "v4.39.0",
+    "rev": "v4.40.0",
    "vendorHash": "sha256-PWSok1sTU/57Xeri4Un5B9Fbwg8gBP6Quy5oIZrjxUI=",
-    "version": "4.39.0"
+    "version": "4.40.0"
  },
  "googleworkspace": {
    "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
@ -615,13 +615,13 @@
    "version": "0.3.0"
  },
  "keycloak": {
-    "hash": "sha256-JDMPr2uFi+9CcHdyigmP1DM3uRx2+eFnzSaHp+es2Tg=",
+    "hash": "sha256-5IMSUSaSoe+zqwtcL6aQ7PTtLpNiWxYp/J38Zm+Hniw=",
    "owner": "mrparkers",
    "provider-source-address": "registry.terraform.io/mrparkers/keycloak",
    "repo": "terraform-provider-keycloak",
-    "rev": "v3.10.0",
-    "vendorHash": "sha256-8x0MlwAzeA2O6wXXHSk++K0ePmzE9/2lfo2ID83LzRM=",
-    "version": "3.10.0"
+    "rev": "v4.0.0",
+    "vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8=",
+    "version": "4.0.0"
  },
  "ksyun": {
    "hash": "sha256-sfvmDByxAQbbdPHb9l5tIT5dyu8eA3r63i5FZJYEYTI=",
@ -1175,22 +1175,22 @@
    "version": "1.9.1"
  },
  "ucloud": {
-    "hash": "sha256-lx3LLBmqUjRc+Jn+SbLk6DChJJ2jbuh720wnO05qot0=",
+    "hash": "sha256-+qbDbss4HSy0hCWiqMBgshvP8WZujJGzy6omXIkypNo=",
    "owner": "ucloud",
    "provider-source-address": "registry.terraform.io/ucloud/ucloud",
    "repo": "terraform-provider-ucloud",
-    "rev": "v1.32.2",
+    "rev": "v1.32.3",
    "vendorHash": null,
-    "version": "1.32.2"
+    "version": "1.32.3"
  },
  "utils": {
    "hash": "sha256-Mh1yj1VZ620xSs1a5j86K4uCUyjzdeCphKLANQvgTNA=",
    "owner": "cloudposse",
    "provider-source-address": "registry.terraform.io/cloudposse/utils",
    "repo": "terraform-provider-utils",
-    "rev": "1.3.0",
+    "rev": "1.4.1",
    "vendorHash": "sha256-00kcosPSk/Ll7UQhnrEGRo0USvFM2V5MLKnndfhQEQA=",
-    "version": "1.3.0"
+    "version": "1.4.1"
  },
  "vault": {
    "hash": "sha256-v+WhEJ9HsTdOqSVpbV/qVCEICsgY3nEqcIutYHi3aQ8=",
--- a/pkgs/applications/networking/n8n/default.nix
+++ b/pkgs/applications/networking/n8n/default.nix
@ -7,17 +7,16 @@ let
  };
 in
 nodePackages.n8n.override {
-  nativeBuildInputs = with pkgs.nodePackages; [
-    node-pre-gyp
+  nativeBuildInputs = [
+    pkgs.nodePackages.node-pre-gyp
+  ];
+
+  buildInputs = [
+    pkgs.postgresql
  ];

  dontNpmInstall = true;

-  postInstall = ''
-    mkdir -p $out/bin
-    ln -s $out/lib/node_modules/n8n/bin/n8n $out/bin/n8n
-  '';
-
  passthru = {
    updateScript = ./generate-dependencies.sh;
    tests = nixosTests.n8n;
--- a/pkgs/applications/networking/n8n/node-env.nix
+++ b/pkgs/applications/networking/n8n/node-env.nix
@ -165,7 +165,11 @@ let
          if(process.argv[2] == "development") {
              replaceDependencies(packageObj.devDependencies);
          }
+          else {
+              packageObj.devDependencies = {};
+          }
          replaceDependencies(packageObj.optionalDependencies);
+          replaceDependencies(packageObj.peerDependencies);

          /* Write the fixed package.json file */
          fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
@ -270,7 +274,7 @@ let

  # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
  reconstructPackageLock = writeTextFile {
-    name = "addintegrityfields.js";
+    name = "reconstructpackagelock.js";
    text = ''
      var fs = require('fs');
      var path = require('path');
@ -280,25 +284,43 @@ let
      var lockObj = {
          name: packageObj.name,
          version: packageObj.version,
-          lockfileVersion: 1,
+          lockfileVersion: 2,
          requires: true,
+          packages: {
+              "": {
+                  name: packageObj.name,
+                  version: packageObj.version,
+                  license: packageObj.license,
+                  bin: packageObj.bin,
+                  dependencies: packageObj.dependencies,
+                  engines: packageObj.engines,
+                  optionalDependencies: packageObj.optionalDependencies
+              }
+          },
          dependencies: {}
      };

-      function augmentPackageJSON(filePath, dependencies) {
+      function augmentPackageJSON(filePath, packages, dependencies) {
          var packageJSON = path.join(filePath, "package.json");
          if(fs.existsSync(packageJSON)) {
              var packageObj = JSON.parse(fs.readFileSync(packageJSON));
+              packages[filePath] = {
+                  version: packageObj.version,
+                  integrity: "sha1-000000000000000000000000000=",
+                  dependencies: packageObj.dependencies,
+                  engines: packageObj.engines,
+                  optionalDependencies: packageObj.optionalDependencies
+              };
              dependencies[packageObj.name] = {
                  version: packageObj.version,
                  integrity: "sha1-000000000000000000000000000=",
                  dependencies: {}
              };
-              processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies);
+              processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies);
          }
      }

-      function processDependencies(dir, dependencies) {
+      function processDependencies(dir, packages, dependencies) {
          if(fs.existsSync(dir)) {
              var files = fs.readdirSync(dir);

@ -314,23 +336,84 @@ let
                          pkgFiles.forEach(function(entry) {
                              if(stats.isDirectory()) {
                                  var pkgFilePath = path.join(filePath, entry);
-                                  augmentPackageJSON(pkgFilePath, dependencies);
+                                  augmentPackageJSON(pkgFilePath, packages, dependencies);
                              }
                          });
                      } else {
-                          augmentPackageJSON(filePath, dependencies);
+                          augmentPackageJSON(filePath, packages, dependencies);
                      }
                  }
              });
          }
      }

-      processDependencies("node_modules", lockObj.dependencies);
+      processDependencies("node_modules", lockObj.packages, lockObj.dependencies);

      fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
    '';
  };

+  # Script that links bins defined in package.json to the node_modules bin directory
+  # NPM does not do this for top-level packages itself anymore as of v7
+  linkBinsScript = writeTextFile {
+    name = "linkbins.js";
+    text = ''
+      var fs = require('fs');
+      var path = require('path');
+
+      var packageObj = JSON.parse(fs.readFileSync("package.json"));
+
+      var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep);
+
+      if(packageObj.bin !== undefined) {
+          fs.mkdirSync(path.join(nodeModules, ".bin"))
+
+          if(typeof packageObj.bin == "object") {
+              Object.keys(packageObj.bin).forEach(function(exe) {
+                  if(fs.existsSync(packageObj.bin[exe])) {
+                      console.log("linking bin '" + exe + "'");
+                      fs.symlinkSync(
+                          path.join("..", packageObj.name, packageObj.bin[exe]),
+                          path.join(nodeModules, ".bin", exe)
+                      );
+                  }
+                  else {
+                      console.log("skipping non-existent bin '" + exe + "'");
+                  }
+              })
+          }
+          else {
+              if(fs.existsSync(packageObj.bin)) {
+                  console.log("linking bin '" + packageObj.bin + "'");
+                  fs.symlinkSync(
+                      path.join("..", packageObj.name, packageObj.bin),
+                      path.join(nodeModules, ".bin", packageObj.name.split("/").pop())
+                  );
+              }
+              else {
+                  console.log("skipping non-existent bin '" + packageObj.bin + "'");
+              }
+          }
+      }
+      else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) {
+          fs.mkdirSync(path.join(nodeModules, ".bin"))
+
+          fs.readdirSync(packageObj.directories.bin).forEach(function(exe) {
+              if(fs.existsSync(path.join(packageObj.directories.bin, exe))) {
+                  console.log("linking bin '" + exe + "'");
+                  fs.symlinkSync(
+                      path.join("..", packageObj.name, packageObj.directories.bin, exe),
+                      path.join(nodeModules, ".bin", exe)
+                  );
+              }
+              else {
+                  console.log("skipping non-existent bin '" + exe + "'");
+              }
+          })
+      }
+    '';
+  };
+
  prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
    let
      forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
@ -377,13 +460,18 @@ let

        npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild

+        runHook postRebuild
+
        if [ "''${dontNpmInstall-}" != "1" ]
        then
            # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
            rm -f npm-shrinkwrap.json

-            npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install
+            npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install
        fi
+
+        # Link executables defined in package.json
+        node ${linkBinsScript}
    '';

  # Builds and composes an NPM package including all its dependencies
--- a/pkgs/applications/networking/n8n/node-packages.nix
+++ b/pkgs/applications/networking/n8n/node-packages.nix
--- a/pkgs/applications/networking/onionshare/default.nix
+++ b/pkgs/applications/networking/onionshare/default.nix
@ -26,12 +26,12 @@
 }:

 let
-  version = "2.5";
+  version = "2.6";
  src = fetchFromGitHub {
    owner = "onionshare";
    repo = "onionshare";
    rev = "v${version}";
-    sha256 = "xCAM+tjjyDg/gqAXr4YNPhM8R3n9r895jktisAGlpZo=";
+    sha256 = "sha256-LA7XlzoCXUiG/9subTddAd22336wO9sOHCIBlQK4Ga4=";
  };
  meta = with lib; {
    description = "Securely and anonymously send and receive files";
--- a/pkgs/applications/networking/onionshare/fix-paths-gui.patch
+++ b/pkgs/applications/networking/onionshare/fix-paths-gui.patch
@ -1,6 +1,6 @@
 --- a/onionshare/gui_common.py
 +++ b/onionshare/gui_common.py
-@@ -410,52 +410,12 @@ class GuiCommon:
+@@ -482,52 +482,12 @@ class GuiCommon:
         }
 
     def get_tor_paths(self):
@ -29,12 +29,12 @@
 -
 -        if self.common.platform == "Windows":
 -            base_path = self.get_resource_path("tor")
-            tor_path = os.path.join(base_path, "Tor", "tor.exe")
-            obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe")
-            snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe")
-            meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe")
-            tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip")
-            tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6")
+-            tor_path = os.path.join(base_path, "tor.exe")
+-            obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.exe")
+-            snowflake_file_path = os.path.join(base_path, "snowflake-client.exe")
+-            meek_client_file_path = os.path.join(base_path, "meek-client.exe")
+-            tor_geo_ip_file_path = os.path.join(base_path, "geoip")
+-            tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")
 -        elif self.common.platform == "Darwin":
 -            base_path = self.get_resource_path("tor")
 -            tor_path = os.path.join(base_path, "tor")
--- a/pkgs/applications/networking/onionshare/fix-paths.patch
+++ b/pkgs/applications/networking/onionshare/fix-paths.patch
@ -1,6 +1,6 @@
 --- a/onionshare_cli/common.py
 +++ b/onionshare_cli/common.py
-@@ -318,67 +318,12 @@ class Common:
+@@ -318,73 +318,12 @@ class Common:
         return path
 
     def get_tor_paths(self):
@ -18,21 +18,27 @@
 -            # In Windows, the Tor binaries are in the onionshare package, not the onionshare_cli package
 -            base_path = self.get_resource_path("tor")
 -            base_path = base_path.replace("onionshare_cli", "onionshare")
-            tor_path = os.path.join(base_path, "Tor", "tor.exe")
+-            tor_path = os.path.join(base_path, "tor.exe")
 -
 -            # If tor.exe isn't there, mayber we're running from the source tree
 -            if not os.path.exists(tor_path):
+-                self.log(
+-                    "Common", "get_tor_paths", f"Cannot find tor.exe at {tor_path}"
+-                )
 -                base_path = os.path.join(os.getcwd(), "onionshare", "resources", "tor")
 -
-                tor_path = os.path.join(base_path, "Tor", "tor.exe")
+-                tor_path = os.path.join(base_path, "tor.exe")
 -                if not os.path.exists(tor_path):
+-                    self.log(
+-                        "Common", "get_tor_paths", f"Cannot find tor.exe at {tor_path}"
+-                    )
 -                    raise CannotFindTor()
 -
-            obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe")
-            snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe")
-            meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe")
-            tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip")
-            tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6")
+-            obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.exe")
+-            snowflake_file_path = os.path.join(base_path, "snowflake-client.exe")
+-            meek_client_file_path = os.path.join(base_path, "meek-client.exe")
+-            tor_geo_ip_file_path = os.path.join(base_path, "geoip")
+-            tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")
 -
 -        elif self.platform == "Darwin":
 -            # Let's see if we have tor binaries in the onionshare GUI package
--- a/pkgs/applications/science/electronics/kicad/base.nix
+++ b/pkgs/applications/science/electronics/kicad/base.nix
@ -168,8 +168,7 @@ stdenv.mkDerivation rec {
  preInstallCheck = optionals (withNgspice) [ "export LD_LIBRARY_PATH=${libngspice}/lib" ];

  # debug builds fail all but the python test
-  # stable release doesn't have the fix for upstream issue 9888 yet
-  doInstallCheck = !debug && !stable;
+  doInstallCheck = !debug;
  installCheckTarget = "test";

  dontStrip = debug;
--- a/pkgs/applications/science/electronics/kicad/versions.nix
+++ b/pkgs/applications/science/electronics/kicad/versions.nix
@ -3,23 +3,23 @@
 {
  "kicad" = {
    kicadVersion = {
-      version =			"6.0.7";
+      version =			"6.0.8";
      src = {
-        rev =			"77480857076960b2e8a70e01aee0b843db37f5f7";
-        sha256 =		"10bqn99nif9zyi5v0lkic3na2vac5lgacw01ayil359vaw7d0pzy";
+        rev =			"f2edbf62ab6eb123d605d06cffedadc424fed55b";
+        sha256 =		"0f5iriahskzflgfzahbjihiff7m7nbdmp3ip8dx69xa28b9012w9";
      };
    };
    libVersion = {
-      version =			"6.0.7";
+      version =			"6.0.8";
      libSources = {
-        symbols.rev =		"059abdef06a0b7b44994ae9948a4f98f7224cb1f";
-        symbols.sha256 =	"006ksx8r6cm6q7v701nalggivp21cmysj8p9zc18y3sch8n1mj4g";
-        templates.rev =		"16d1898d52f1277ce9bd75640a32f7d2c6d122bf";
+        symbols.rev =		"64a2f338f3f994975edfd33bc04f92fd6b9ed1c3";
+        symbols.sha256 =	"1nxz8r3h3j62fs3s77lj27333fsj5c4i01n05lv0gqx36h28hqxk";
+        templates.rev =		"549275966dd4f01ce656cec2b46599d1b7a3ca62";
        templates.sha256 =	"08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v";
-        footprints.rev =	"26e8be9805444cc25d03d2263277aa06620f5374";
-        footprints.sha256 =	"0c5fm4hlkka0ms43j02kbv7s9yrlkffn0jz6649ac3gpx6pk8lbf";
-        packages3d.rev =	"cd9551dfb37ab0c086cac63564e54a7bc7b611d8";
-        packages3d.sha256 =	"0rdhwyhknrc63sc5ykmq097rzrl36zibnkls7q5hf54lrhn0n3k4";
+        footprints.rev =	"8eedad538f5b8234d3889ad08a3f272832b724b1";
+        footprints.sha256 =	"19di37hi80rzlwd468w3b6bq5kzxbslp3daskv8xb4y4f7pk3n00";
+        packages3d.rev =	"471e36d23c2d4f9971a591e2ab6ce717709438f9";
+        packages3d.sha256 =	"0cnrg7mr3khpglviid1adk2ihs1qwj0r7l32z2vqsl8aidzbg9kr";
      };
    };
  };
--- a/pkgs/applications/science/logic/bitwuzla/default.nix
+++ b/pkgs/applications/science/logic/bitwuzla/default.nix
@ -5,6 +5,7 @@
 , cmake
 , lingeling
 , btor2tools
+, symfpu
 , gtest
 , gmp
 , cadical
@ -19,13 +20,13 @@

 stdenv.mkDerivation rec {
  pname = "bitwuzla";
-  version = "unstable-2022-08-07";
+  version = "unstable-2022-10-03";

  src = fetchFromGitHub {
    owner = "bitwuzla";
    repo = "bitwuzla";
-    rev = "b6fb61736a5cf70cd0b35ec4aeeadf23971610ce";
-    hash = "sha256-T5VnnWrcZ8K1NjFf5eeg0TRpXBLRCxC67v8zWPwYF/Y=";
+    rev = "3bc0f9f1aca04afabe1aff53dd0937924618b2ad";
+    hash = "sha256-UXZERl7Nedwex/oUrcf6/GkDSgOQ537WDYm117RfvWo=";
  };

  nativeBuildInputs = [ cmake pkg-config ];
@ -35,6 +36,7 @@ stdenv.mkDerivation rec {
    picosat
    minisat
    btor2tools
+    symfpu
    gmp
    zlib
  ] ++ lib.optional withLingeling lingeling;
--- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "ghorg";
-  version = "1.8.7";
+  version = "1.8.8";

  src = fetchFromGitHub {
    owner = "gabrie30";
    repo = "ghorg";
    rev = "v${version}";
-    sha256 = "sha256-3NlGS6DTTE0FCsvNPBNaxxbYcKKwE3gd1jsfdxlTl38=";
+    sha256 = "sha256-xB/TdeXC0V8dZs6N6Uq1+gzG84j9uhSrwkSbIMwUWSk=";
  };

  doCheck = false;
--- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
@ -1,29 +1,21 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , unixtools
 , which
 }:

 stdenv.mkDerivation rec {
  pname = "git-extras";
-  version = "6.4.0";
+  version = "6.5.0";

  src = fetchFromGitHub {
    owner = "tj";
    repo = "git-extras";
    rev = version;
-    sha256 = "sha256-Cn7IXMzgg0QIsNIHz+X14Gkmop0UbsSBlGlGkmg71ek=";
+    sha256 = "sha256-7VNkIFjz4stRT48a9uXks84W7/tP3p7esMJKnIe1O+8=";
  };

-  patches = [
-    (fetchpatch {
-      url = "https://github.com/tj/git-extras/commit/66961ad4911cd0f1a908530f2b725bacc7d198e1.patch";
-      sha256 = "sha256-iC1lUf/NmuAPADxDWZ2JScHIMgYjIaR0edlGpq0qCOc=";
-    })
-  ];
-
  postPatch = ''
    patchShebangs check_dependencies.sh
  '';
--- a/pkgs/applications/version-management/git-and-tools/thicket/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/thicket/default.nix
@ -1,22 +1,21 @@
 { lib
-, fetchFromGitHub
 , crystal
+, fetchFromGitHub
 }:

 crystal.buildCrystalPackage rec {
  pname = "thicket";
-  version = "0.1.5";
+  version = "0.1.6";

  src = fetchFromGitHub {
    owner = "taylorthurlow";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-7X1RKj/FWgJdgA7P746hU0ndUM49fH79ZNRSkvNZYFg=";
+    sha256 = "sha256-sF+fNKEZEfjpW3buh6kFUpL1P0yO9g4SrTb0rhx1uNc=";
  };

  format = "shards";

-  shardsFile = ./shards.nix;
  crystalBinaries.thicket.src = "src/thicket.cr";

  # there is one test that tries to clone a repo
--- a/pkgs/applications/version-management/git-and-tools/thicket/shards.nix
+++ b/pkgs/applications/version-management/git-and-tools/thicket/shards.nix
@ -1,8 +0,0 @@
-{
-  ameba = {
-    owner = "veelenga";
-    repo = "ameba";
-    rev = "v0.14.3";
-    sha256 = "1cfr95xi6hsyxw1wlrh571hc775xhwmssk3k14i8b7dgbwfmm5x1";
-  };
-}
--- a/pkgs/applications/version-management/p4/default.nix
+++ b/pkgs/applications/version-management/p4/default.nix
@ -1,31 +1,115 @@
-{ stdenv, fetchurl, lib, autoPatchelfHook }:
+{ stdenv
+, fetchurl
+, fetchzip
+, lib
+, emptyDirectory
+, linkFarm
+, symlinkJoin
+, jam
+, libcxx
+, libcxxabi
+, openssl
+, xcbuild
+, CoreServices
+, Foundation
+, Security
+}:

+let
+  opensslStatic = openssl.override {
+    static = true;
+  };
+  androidZlibContrib =
+    let
+      src = fetchzip {
+        url = "https://android.googlesource.com/platform/external/zlib/+archive/61174f4fd262c6075f88768465f308aae95a2f04.tar.gz";
+        sha256 = "sha256-EMzKAHcEWOUugcHKH2Fj3ZaIHC9UlgO4ULKe3RvgxvI=";
+        stripRoot = false;
+      };
+    in
+    linkFarm "android-zlib-contrib" [
+      # We only want to keep the contrib directory as the other files conflict
+      # with p4's own zlib files. (For the same reason, we can't use the
+      # cone-based Git sparse checkout, either.)
+      { name = "contrib"; path = "${src}/contrib"; }
+    ];
+  libcxxUnified = symlinkJoin {
+    inherit (libcxx) name;
+    paths = [ libcxx libcxxabi ];
+  };
+in
 stdenv.mkDerivation rec {
  pname = "p4";
-  version = "2021.2.2201121";
+  version = "2022.1.2305383";

  src = fetchurl {
-    # actually  https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz but upstream deletes releases
-    url = "https://web.archive.org/web/20211118024943/https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz";
-    sha256 = "sha256-SrfI2ZD7KDyttCd8+fo8g4UZKljYYO/SbzqrS9tAcC8=";
+    # Upstream replaces minor versions, so use archived URL.
+    url = "https://web.archive.org/web/20220901184735id_/https://ftp.perforce.com/perforce/r22.1/bin.tools/p4source.tgz";
+    sha256 = "27ab3ddd7b178b05cf0b710e941650dac0688d294110ebafda9027732c0944c6";
  };

-  sourceRoot = ".";
+  nativeBuildInputs = [ jam ];

-  dontBuild = true;
+  buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation Security ];

-  nativeBuildInputs = [ autoPatchelfHook ];
+  outputs = [ "out" "bin" "dev" ];

-  installPhase = ''
-    install -D --target $out/bin p4 p4broker p4d p4p
+  hardeningDisable = lib.optionals stdenv.isDarwin [ "strictoverflow" ];
+
+  jamFlags =
+    [
+      "-sEXEC=bin.unix"
+      "-sCROSS_COMPILE=${stdenv.cc.targetPrefix}"
+      "-sMALLOC_OVERRIDE=no"
+      "-sSSLINCDIR=${lib.getDev opensslStatic}/include"
+      "-sSSLLIBDIR=${lib.getLib opensslStatic}/lib"
+    ]
+    ++ lib.optionals stdenv.cc.isClang [ "-sOSCOMP=clang" "-sCLANGVER=${stdenv.cc.cc.version}" ]
+    ++ lib.optionals stdenv.cc.isGNU [ "-sOSCOMP=gcc" "-sGCCVER=${stdenv.cc.cc.version}" ]
+    ++ lib.optionals stdenv.isLinux [ "-sOSVER=26" ]
+    ++ lib.optionals stdenv.isDarwin [
+      "-sOSVER=1013"
+      "-sMACOSX_SDK=${emptyDirectory}"
+      "-sLIBC++DIR=${libcxxUnified}/lib"
+    ];
+
+  CCFLAGS =
+    # The file contrib/optimizations/slide_hash_neon.h is missing from the
+    # upstream distribution. It comes from the Android/Chromium sources.
+    lib.optionals stdenv.isAarch64 [ "-I${androidZlibContrib}" ];
+
+  "C++FLAGS" =
+    # Avoid a compilation error that only occurs for 4-byte longs.
+    lib.optionals stdenv.isi686 [ "-Wno-narrowing" ]
+    # See the "Header dependency changes" section of
+    # https://www.gnu.org/software/gcc/gcc-11/porting_to.html for more
+    # information on why we need to include these.
+    ++ lib.optionals
+      (stdenv.cc.isClang || (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.cc.version "11.0.0"))
+      [ "-include" "limits" "-include" "thread" ];
+
+  buildPhase = ''
+    runHook preBuild
+    jam $jamFlags -j$NIX_BUILD_CORES p4
+    jam $jamFlags -j$NIX_BUILD_CORES -sPRODUCTION=yes p4api.tar
+    runHook postBuild
  '';

-  meta = {
-    description = "Perforce Command-Line Client";
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $bin/bin $dev $out
+    cp bin.unix/p4 $bin/bin
+    cp -r bin.unix/p4api-${version}/include $dev
+    cp -r bin.unix/p4api-${version}/lib $out
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Perforce Helix Core command-line client and APIs";
    homepage = "https://www.perforce.com";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = lib.licenses.unfree;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with lib.maintainers; [ corngood ];
+    license = licenses.bsd2;
+    mainProgram = "p4";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ corngood impl ];
  };
 }
--- a/pkgs/applications/version-management/p4d/default.nix
+++ b/pkgs/applications/version-management/p4d/default.nix
@ -47,6 +47,6 @@ stdenv.mkDerivation {
    license = licenses.unfree;
    mainProgram = "p4d";
    platforms = builtins.attrNames srcs;
-    maintainers = with maintainers; [ impl ];
+    maintainers = with maintainers; [ corngood impl ];
  };
 }
--- a/pkgs/applications/video/showmethekey/default.nix
+++ b/pkgs/applications/video/showmethekey/default.nix
@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , glib
 , meson
 , ninja
@ -10,10 +11,11 @@
 , pango
 , libinput
 , gtk4
-, wrapGAppsHook
+, wrapGAppsHook4
 , libxkbcommon
 , pkg-config
 }:
+
 stdenv.mkDerivation rec {
  pname = "showmethekey";
  version = "1.7.3";
@ -25,6 +27,14 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-hq4X4dG25YauMjsNXC6Flco9pEpVj3EM2JiFWbRrPaA=";
  };

+  patches = [
+    (fetchpatch {
+      name = "use-gtk4-update-icon-cache.patch";
+      url = "https://github.com/alynxzhou/showmethekey/commit/c73102dc2825d00cbaf323fcfc96736381dc67ae.patch";
+      sha256 = "sha256-6QDY5eQ9A8q3LZeD7v6WI/4vYXc/XXVY/WENA1nvIKo=";
+    })
+  ];
+
  nativeBuildInputs = [
    glib
    meson
@ -36,7 +46,7 @@ stdenv.mkDerivation rec {
    libevdev
    libinput
    libxkbcommon
-    wrapGAppsHook
+    wrapGAppsHook4
  ];

  buildInputs = [
--- a/pkgs/applications/virtualization/buildkit-nix/default.nix
+++ b/pkgs/applications/virtualization/buildkit-nix/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "buildkit-nix";
-  version = "0.0.3";
+  version = "0.1.0";

  src = fetchFromGitHub {
-    owner = "AkihiroSuda";
+    owner = "reproducible-containers";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-hrrvDby+UDwY0wvq/HIP9lYVEa/flr/1gtGXHMN8Mug=";
+    sha256 = "sha256-gKTCBz7om1M7UBzyMJDetNGcKLkQKMyuzwrHBbuuifM=";
  };

  vendorSha256 = "sha256-1H5oWgcaamf+hocABWWnzJUjWiqwk1ZZtbBjF6EKzzU=";
@ -19,7 +19,7 @@ buildGoModule rec {

  meta = with lib; {
    description = "Nix frontend for BuildKit";
-    homepage = "https://github.com/AkihiroSuda/buildkit-nix/";
+    homepage = "https://github.com/reproducible-containers/buildkit-nix/";
    license = licenses.asl20;
    platforms = platforms.linux;
    maintainers = with maintainers; [ lesuisse ];
--- a/pkgs/applications/virtualization/pods/default.nix
+++ b/pkgs/applications/virtualization/pods/default.nix
@ -8,7 +8,7 @@
 , ninja
 , pkg-config
 , rustPlatform
-, wrapGAppsHook
+, wrapGAppsHook4
 , gtksourceview5
 , libadwaita
 }:
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
    rustPlatform.cargoSetupHook
    rustPlatform.rust.cargo
    rustPlatform.rust.rustc
-    wrapGAppsHook
+    wrapGAppsHook4
  ];

  buildInputs = [
--- a/pkgs/build-support/writers/default.nix
+++ b/pkgs/build-support/writers/default.nix
@ -207,7 +207,7 @@ let
    };
  in writeDash name ''
    export NODE_PATH=${node-env}/lib/node_modules
-    exec ${pkgs.nodejs}/bin/node ${pkgs.writeText "js" content}
+    exec ${pkgs.nodejs}/bin/node ${pkgs.writeText "js" content} "$@"
  '';

  # writeJSBin takes the same arguments as writeJS but outputs a directory (like writeScriptBin)
--- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
@ -11,13 +11,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "elementary-gtk-theme";
-  version = "7.0.0";
+  version = "7.0.1";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "stylesheet";
    rev = version;
-    sha256 = "sha256-ZnQ54ktH0/ZyFH6c180YzbkK/TyIDziiwAXi/zqHpe4=";
+    sha256 = "sha256-KUo9IbB10JRgFrn6I5y4+34PEihuwp78b+YsX2Wqip8=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/pantheon/granite/7/default.nix
+++ b/pkgs/desktops/pantheon/granite/7/default.nix
@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , nix-update-script
 , python3
 , meson
@ -19,7 +18,7 @@

 stdenv.mkDerivation rec {
  pname = "granite";
-  version = "7.0.0";
+  version = "7.1.0";

  outputs = [ "out" "dev" ];

@ -27,19 +26,9 @@ stdenv.mkDerivation rec {
    owner = "elementary";
    repo = pname;
    rev = version;
-    sha256 = "sha256-fuyjQDH3C8qRYuAfQDDeW3aSWVTLtGzMAjcuAHCB1Zw=";
+    sha256 = "sha256-tdZSiIK+BW8uhbRxLUcrGQt71jRfVLOTgFNOqeLK6ig=";
  };

-  patches = [
-    # MessageDialog: Fix large height bug
-    # https://github.com/elementary/granite/pull/616
-    (fetchpatch {
-      url = "https://github.com/elementary/granite/commit/28e9b60fc8257b2d8e76412518e96a7e03efc6e4.patch";
-      sha256 = "sha256-3VH5bhX8tuNR3Iabz3JjkLfVVyO5eSnYacFgdqurU0A=";
-      excludes = [ "data/granite.appdata.xml.in" ];
-    })
-  ];
-
  nativeBuildInputs = [
    gettext
    gobject-introspection
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@ -11,7 +11,11 @@ let
      sources = {
        "${dartVersion}-x86_64-linux" = fetchurl {
          url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
-          sha256 = dartHash;
+          sha256 = dartHash.x86_64-linux;
+        };
+        "${dartVersion}-aarch64-linux" = fetchurl {
+          url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
+          sha256 = dartHash.aarch64-linux;
        };
      };
    };
@ -28,7 +32,10 @@ in
    version = "3.3.3";
    dartVersion = "2.18.2";
    hash = "sha256-MTZeWQUp4/TcPzYIT6eqIKSPUPvn2Mp/thOQzNgpTXg=";
-    dartHash = "sha256-C3+YjecXLvSmJrLwi9H7TgD9Np0AArRWx3EdBrfQpTU";
+    dartHash = {
+      x86_64-linux = "sha256-C3+YjecXLvSmJrLwi9H7TgD9Np0AArRWx3EdBrfQpTU";
+      aarch64-linux = "sha256-zyIK1i5/9P2C+sjzdArhFwpVO4P+It+/X50l+n9gekI=";
+    };
    patches = getPatches ./patches/flutter3;
  };

@ -37,7 +44,10 @@ in
    version = "2.10.5";
    dartVersion = "2.16.2";
    hash = "sha256-DTZwxlMUYk8NS1SaWUJolXjD+JnRW73Ps5CdRHDGnt0=";
-    dartHash = "sha256-egrYd7B4XhkBiHPIFE2zopxKtQ58GqlogAKA/UeiXnI=";
+    dartHash = {
+      x86_64-linux = "sha256-egrYd7B4XhkBiHPIFE2zopxKtQ58GqlogAKA/UeiXnI=";
+      aarch64-linux = "sha256-vmerjXkUAUnI8FjK+62qLqgETmA+BLPEZXFxwYpI+KY=";
+    };
    patches = getPatches ./patches/flutter2;
  };
 }
--- a/pkgs/development/compilers/flutter/flutter.nix
+++ b/pkgs/development/compilers/flutter/flutter.nix
@ -174,7 +174,7 @@ runCommand drvName
    '';
    homepage = "https://flutter.dev";
    license = licenses.bsd3;
-    platforms = [ "x86_64-linux" ];
+    platforms = [ "x86_64-linux" "aarch64-linux" ];
    maintainers = with maintainers; [ babariviere ericdallo ];
  };
 } ''
--- a/pkgs/development/compilers/ligo/default.nix
+++ b/pkgs/development/compilers/ligo/default.nix
@ -3,27 +3,27 @@
 , git
 , coq
 , cacert
+, ocaml-crunch
 }:

 coq.ocamlPackages.buildDunePackage rec {
  pname = "ligo";
-  version = "0.36.0";
+  version = "0.47.0";
  src = fetchFromGitLab {
    owner = "ligolang";
    repo = "ligo";
    rev = version;
-    sha256 = "0zx8ai79ha3npm3aybzgisil27v9i052cqdllfri0fsc67dig78b";
+    sha256 = "sha256-VJs0pKA99mZXhipK1bSAZmgAHvYbGbjxdI2XyJYjSm0=";
    fetchSubmodules = true;
  };

  # The build picks this up for ligo --version
  LIGO_VERSION = version;

-  useDune2 = true;
-
  strictDeps = true;

  nativeBuildInputs = [
+    ocaml-crunch
    git
    coq
    coq.ocamlPackages.menhir
@ -49,6 +49,11 @@ coq.ocamlPackages.buildDunePackage rec {
    core_unix
    pprint
    linenoise
+    dune-configurator
+    ctypes_stubs_js
+    crunch
+    zarith_stubs_js
+    pure-splitmix

    # Test helpers deps
    qcheck
@ -61,7 +66,7 @@ coq.ocamlPackages.buildDunePackage rec {
    hacl-star-raw
    lwt-canceler
    ipaddr
-    bls12-381-unix
+    bls12-381
    bls12-381-legacy
    ptime
    mtime
--- a/pkgs/development/compilers/ligo/ligo.patch
+++ b/pkgs/development/compilers/ligo/ligo.patch
@ -1,23 +1,40 @@
+From 6926fed076c2f5aa3282dbca10538d156c045c6f Mon Sep 17 00:00:00 2001
+From: bezmuth <benkel97@protonmail.com>
+Date: Wed, 3 Aug 2022 15:53:10 +0100
+Subject: [PATCH] Compat with core v0.15.0
+
+---
+ ligo.opam                                  | 4 +++-
+ ligo.opam.locked                           | 5 +++--
+ src/bin/cli.ml                             | 4 ++--
+ src/bin/dune                               | 4 +++-
+ src/main/helpers/cli_helpers.ml            | 4 ++--
+ src/main/interpreter/dune                  | 2 +-
+ src/main/interpreter/interpreter.ml        | 2 ++
+ vendors/ligo-utils/simple-utils/dune       | 1 +
+ vendors/ligo-utils/simple-utils/snippet.ml | 2 +-
+ 9 files changed, 18 insertions(+), 10 deletions(-)
+
 diff --git a/ligo.opam b/ligo.opam
-index d561c74d1..3a8d34feb 100644
+index 47513217f..073f68ff5 100644
 --- a/ligo.opam
 +++ b/ligo.opam
@@ -10,7 +10,9 @@ license: "MIT"
 # If you change the dependencies, run `opam lock` in the root
 depends: [
   # Jane Street Core
-  "core"
-+  "core" { >= "v0.14.0" & < "v0.16.0" }
-+  "core_kernel" { >= "v0.14.0" & "v0.16.0" }
-+  "core_unix" { >= "v0.14.0" & "v0.16.0" }
+-  "core" {= "v0.14.1"}
+  "core" {>= "v0.14.1" & < "v0.16.0"}
+  "core_kernel" { >= "v0.14.1" & "v0.16.0"}
+  "core_unix" { >= "v0.14.1"  & "v0.16.0"}
   # Tooling
   "odoc" { build }
   "ocamlfind" { build }
 diff --git a/ligo.opam.locked b/ligo.opam.locked
-index b4501cc76..c8ed8a41f 100644
+index fd6fccf03..458e11791 100644
 --- a/ligo.opam.locked
 +++ b/ligo.opam.locked
-@@ -50,8 +50,9 @@ depends: [
+@@ -47,8 +47,9 @@ depends: [
   "conf-rust" {= "0.1"}
   "conf-which" {= "1"}
   "coq" {= "8.13.2"}
@ -28,12 +45,12 @@ index b4501cc76..c8ed8a41f 100644
 +  "core_unix" {= "v0.15.0"}
   "cppo" {= "1.6.8"}
   "csexp" {= "1.5.1"}
-   "cstruct" {= "6.0.1"}
+   "cstruct" {= "6.1.0"}
 diff --git a/src/bin/cli.ml b/src/bin/cli.ml
-index a6fc13e0d..ef5177868 100644
+index dcaa85621..e411d8f32 100644
 --- a/src/bin/cli.ml
 +++ b/src/bin/cli.ml
-@@ -12,7 +12,7 @@ let entry_point =
+@@ -14,7 +14,7 @@ let entry_point =
 let source_file =
     let name = "SOURCE_FILE" in
     let _doc = "the path to the smart contract file." in
@ -42,7 +59,7 @@ index a6fc13e0d..ef5177868 100644
 
 let package_name =
   let name = "PACKAGE_NAME" in
-@@ -662,7 +662,7 @@ let main = Command.group ~preserve_subcommand_order:() ~summary:"the LigoLANG co
+@@ -783,7 +783,7 @@ let main = Command.group ~preserve_subcommand_order:() ~summary:"The LigoLANG co
   ]
 
 let run ?argv () =
@ -51,27 +68,8 @@ index a6fc13e0d..ef5177868 100644
   (* Effect to error code *)
   match !return with
     Done -> 0;
-@@ -677,4 +677,3 @@ let run ?argv () =
-     match exn with
-     | Failure msg -> message msg
-     | exn -> message (Exn.to_string exn)
-  
-diff --git a/src/bin/cli_helpers.ml b/src/bin/cli_helpers.ml
-index b64a17d53..8c4c43dde 100644
--- a/src/bin/cli_helpers.ml
-+++ b/src/bin/cli_helpers.ml
-@@ -66,7 +66,7 @@ let run_command (cmd : command) =
-     (fun p -> Lwt.map  
-       (fun status -> 
-         match status with
-          Caml.Unix.WEXITED 0 -> Ok ()
-+          Caml_unix.WEXITED 0 -> Ok ()
-         | _ -> Error ("unknown error"))
-         p#status) in
-   Lwt_main.run status
-\ No newline at end of file
 diff --git a/src/bin/dune b/src/bin/dune
-index 295c056f3..08d980439 100644
+index 03e5f17b5..74340ae9d 100644
 --- a/src/bin/dune
 +++ b/src/bin/dune
@@ -11,7 +11,9 @@
@ -84,31 +82,47 @@ index 295c056f3..08d980439 100644
 +  core_unix.filename_unix)
  (modules cli version))
 
- (library
+ 
+diff --git a/src/main/helpers/cli_helpers.ml b/src/main/helpers/cli_helpers.ml
+index 3d09ee6b8..585cca6fa 100644
+--- a/src/main/helpers/cli_helpers.ml
+++ b/src/main/helpers/cli_helpers.ml
+@@ -71,7 +71,7 @@ let run_command (cmd : command) =
+     (fun p -> Lwt.map  
+       (fun status -> 
+         match status with
+-          Caml.Unix.WEXITED 0 -> Ok ()
+          Caml_unix.WEXITED 0 -> Ok ()
+         | _ -> Error ("unknown error"))
+         p#status) in
+-  Lwt_main.run status
+\ No newline at end of file
+  Lwt_main.run status
 diff --git a/src/main/interpreter/dune b/src/main/interpreter/dune
-index c55e24a88..f9762a297 100644
+index 6ccc74ff0..7d38bb822 100644
 --- a/src/main/interpreter/dune
 +++ b/src/main/interpreter/dune
@@ -4,4 +4,4 @@
  (instrumentation
   (backend bisect_ppx))
-  (libraries tezos-011-PtHangz2-test-helpers ast_aggregated ligo_interpreter
-   main_errors ligo_compile build fuzz ligo_run self_ast_typed))
-+   main_errors ligo_compile build fuzz ligo_run self_ast_typed core_unix.sys_unix))
+  (libraries tezos-013-PtJakart-test-helpers ast_aggregated ligo_interpreter
+-   main_errors ligo_compile build fuzz ligo_run self_ast_typed bls12-381))
+   main_errors ligo_compile build fuzz ligo_run self_ast_typed bls12-381 core_unix.sys_unix))
 diff --git a/src/main/interpreter/interpreter.ml b/src/main/interpreter/interpreter.ml
-index b0379029c..530e08c3a 100644
+index 0f76a286c..d9a389a6b 100644
 --- a/src/main/interpreter/interpreter.ml
 +++ b/src/main/interpreter/interpreter.ml
-@@ -2,6 +2,7 @@ open Simple_utils.Trace
- open Simple_utils
+@@ -3,6 +3,8 @@ open Simple_utils
 open Ligo_interpreter.Types
 open Ligo_interpreter.Combinators
-+module Sys = Sys_unix
 
+module Sys = Sys_unix
+
 module AST = Ast_aggregated
 
+ include AST.Types
 diff --git a/vendors/ligo-utils/simple-utils/dune b/vendors/ligo-utils/simple-utils/dune
-index ca9f2bf5c..62c39087b 100644
+index becca2f86..a890dbf62 100644
 --- a/vendors/ligo-utils/simple-utils/dune
 +++ b/vendors/ligo-utils/simple-utils/dune
@@ -6,6 +6,7 @@
@ -132,3 +146,6 @@ index 658f115f2..f23000590 100644
   let start = l#start#line in
   let start_column = l#start#offset `Byte in
   let stop = l#stop#line in
+-- 
+2.36.1
+
--- a/pkgs/development/compilers/purescript/purescript/default.nix
+++ b/pkgs/development/compilers/purescript/purescript/default.nix
@ -18,7 +18,7 @@ let

 in stdenv.mkDerivation rec {
  pname = "purescript";
-  version = "0.15.4";
+  version = "0.15.5";

  # These hashes can be updated automatically by running the ./update.sh script.
  src =
@ -26,12 +26,12 @@ in stdenv.mkDerivation rec {
    then
    fetchurl {
      url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
-      sha256 = "0rksc6c98pp48lcavair6apjpgq3s1zz0lhkc59vbz67c8zxc26d";
+      sha256 = "1q67yg1i8xd0pjx82lp2lkk95ah86r46gmxnliy0r4lllyr4x4fv";
    }
    else
    fetchurl {
      url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
-      sha256 = "13p6qsba6kmcsppc3z6vcm3v5c7jxhp10nyvxry4nmj9mkdmjaiy";
+      sha256 = "17cczln5gdbg274h16l82hgnnwfb1ylvxd2h7119ig834dcbppxn";
    };


--- a/pkgs/development/coq-modules/VST/default.nix
+++ b/pkgs/development/coq-modules/VST/default.nix
@ -25,7 +25,7 @@ mkCoqDerivation {
  repo = "VST";
  inherit version;
  defaultVersion = with versions; switch coq.coq-version [
-    { case = range "8.14" "8.15"; out = "2.10"; }
+    { case = range "8.14" "8.16"; out = "2.10"; }
    { case = range "8.13" "8.15"; out = "2.9"; }
    { case = range "8.12" "8.13"; out = "2.8"; }
  ] null;
@ -39,7 +39,7 @@ mkCoqDerivation {
  preConfigure = ''
    patchShebangs util
    substituteInPlace Makefile \
-      --replace 'COQVERSION= ' 'COQVERSION= 8.15.2 or-else 8.15.1 or-else '\
+      --replace 'COQVERSION= ' 'COQVERSION= 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\
      --replace 'FLOYD_FILES=' 'FLOYD_FILES= ${toString extra_floyd_files}'
  '';

--- a/pkgs/development/coq-modules/compcert/default.nix
+++ b/pkgs/development/coq-modules/compcert/default.nix
@ -16,7 +16,7 @@ let compcert = mkCoqDerivation rec {
  releaseRev = v: "v${v}";

  defaultVersion =  with versions; switch coq.version [
-      { case = range "8.14" "8.15"; out = "3.11"; }
+      { case = range "8.14" "8.16"; out = "3.11"; }
      { case = isEq "8.13"        ; out = "3.10"; }
      { case = isEq "8.12"       ; out = "3.9"; }
      { case = range "8.8" "8.11"; out = "3.8"; }
@ -138,6 +138,15 @@ compcert.overrideAttrs (o:
          })
        ];
      }
+      { cases = [ (isEq "8.16") "3.11" ];
+        out = [
+          # Support for Coq 8.16.0
+          (fetchpatch {
+            url = "https://github.com/AbsInt/CompCert/commit/34be08a23d18d56f2dde24fd24b6dbe3bcb01ec3.patch";
+            sha256 = "sha256-a5YnftGVadVypEqrOYRRxI7YtGOEWyKnO4GqakFhvzI=";
+          })
+        ];
+      }
    ] [];
  }
 )
--- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix
+++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix
@ -1,7 +1,8 @@
 { lib,
  mkCoqDerivation, recurseIntoAttrs,
-  mathcomp, mathcomp-finmap, mathcomp-bigenough, mathcomp-real-closed,
+  mathcomp, mathcomp-finmap, mathcomp-bigenough,
  hierarchy-builder,
+  single ? false,
  coqPackages, coq, version ? null }@args:
 with builtins // lib;
 let
@ -36,20 +37,23 @@ let
  packages = [ "classical" "analysis" ];

  mathcomp_ = package: let
-      analysis-deps = map mathcomp_ (head (splitList (pred.equal package) packages));
-      pkgpath = if package == "analysis" then "theories" else "${package}";
-      pname = "mathcomp-${package}";
+      classical-deps = [ mathcomp.algebra mathcomp-finmap hierarchy-builder ];
+      analysis-deps = [ mathcomp.field mathcomp-bigenough ];
+      intra-deps = if package == "single" then []
+        else map mathcomp_ (head (splitList (pred.equal package) packages));
+      pkgpath = if package == "single" then "."
+        else if package == "analysis" then "theories" else "${package}";
+      pname = if package == "single" then "mathcomp-analysis-single"
+        else "mathcomp-${package}";
      derivation = mkCoqDerivation ({
        inherit version pname defaultVersion release repo owner;

        namePrefix = [ "coq" "mathcomp" ];

        propagatedBuildInputs =
-          (if package == "classical" then
-             [ mathcomp.ssreflect mathcomp.algebra mathcomp-finmap ]
-           else
-             [ mathcomp.field mathcomp-bigenough mathcomp-real-closed ])
-          ++ [ analysis-deps ];
+          intra-deps
+          ++ optionals (elem package [ "classical" "single" ]) classical-deps
+          ++ optionals (elem package [ "analysis" "single" ]) analysis-deps;

        preBuild = ''
          cd ${pkgpath}
@ -83,4 +87,4 @@ let
    );
    in patched-derivation;
 in
-mathcomp_ "analysis"
+mathcomp_ (if single then "single" else "analysis")
--- a/pkgs/development/embedded/avrdude/default.nix
+++ b/pkgs/development/embedded/avrdude/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, bison, flex, libusb-compat-0_1, libelf, libftdi1, readline
+{ lib, stdenv, fetchFromGitHub, cmake, bison, flex, libusb-compat-0_1, libelf, libftdi1, readline
 # docSupport is a big dependency, disabled by default
 , docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null
 }:
@ -9,16 +9,22 @@ stdenv.mkDerivation rec {
  pname = "avrdude";
  version = "7.0";

-  src = fetchurl {
-    url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-wO9l2Y1gQMoLTytwDVFGPCoflGZUQfOdFdl0Qtu3m1Q=";
+  src = fetchFromGitHub {
+    owner = "avrdudes";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-T8MKrvBvFF3WFwBMIN75vCOS0khliHQI+GGQvCk7T1o=";
  };

-  configureFlags = lib.optionals docSupport "--enable-doc";
+  nativeBuildInputs = [ cmake bison flex ];

-  buildInputs = [ bison flex libusb-compat-0_1 libelf libftdi1 readline ]
+  buildInputs = [ libusb-compat-0_1 libelf libftdi1 readline ]
    ++ lib.optionals docSupport [ texLive texinfo texi2html ];

+  cmakeFlags = lib.optionals docSupport [
+    "-DBUILD_DOC=ON"
+  ];
+
  meta = with lib; {
    description = "Command-line tool for programming Atmel AVR microcontrollers";
    longDescription = ''
--- a/pkgs/development/interpreters/bqn/cbqn/default.nix
+++ b/pkgs/development/interpreters/bqn/cbqn/default.nix
@ -4,6 +4,7 @@
 , genBytecode ? false
 , bqn-path ? null
 , mbqn-source ? null
+, libffi
 }:

 let
@ -11,23 +12,27 @@ let
    name = "cbqn-bytecode-files";
    owner = "dzaima";
    repo = "CBQN";
-    rev = "c39653c898531a2cdbf4cc5c764df6e37b1894a4";
-    hash = "sha256-JCEmkwh5Rv5+NQoxvefSrYnayU892/Wam+gjMgcQmO0=";
+    rev = "3df8ae563a626ff7ae0683643092f0c3bc2481e5";
+    hash = "sha256:0rh9qp1bdm9aa77l0kn9n4jdy08gl6l7898lncskxiq9id6xvyb8";
  };
 in
 assert genBytecode -> ((bqn-path != null) && (mbqn-source != null));

 stdenv.mkDerivation rec {
  pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone";
-  version = "0.pre+date=2022-05-06";
+  version = "0.pre+date=2022-10-04";

  src = fetchFromGitHub {
    owner = "dzaima";
    repo = "CBQN";
-    rev = "3496a939b670f8c9ca2a04927378d6b7e9abd68e";
-    hash = "sha256-P+PoY4XF9oEw7VIpmybvPp+jxWHEo2zt1Lamayf1mHg=";
+    rev = "abcb575a537712763e9e53b6cb0eb415346b00e6";
+    hash = "sha256:05gqw2ppcykv36ji8mkp8mq502q84vk9algp9c2d3z495xqy8rn6";
  };

+  buildInputs = [
+    libffi
+  ];
+
  dontConfigure = true;

  postPatch = ''
@ -44,8 +49,13 @@ stdenv.mkDerivation rec {
  '' + (if genBytecode then ''
    ${bqn-path} genRuntime ${mbqn-source}
  '' else ''
-    cp ${cbqn-bytecode-files}/src/gen/{compiles,formatter,runtime0,runtime1,src} src/gen/
-  '');
+    cp ${cbqn-bytecode-files}/src/gen/{compiles,explain,formatter,runtime0,runtime1,src} src/gen/
+  '')
+  # Need to adjust ld flags for darwin manually
+  # https://github.com/dzaima/CBQN/issues/26
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    makeFlagsArray+=(LD_LIBS="-ldl -lffi")
+  '';

  installPhase = ''
     runHook preInstall
--- a/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix
+++ b/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix
@ -7,13 +7,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "bqn";
-  version = "0.pre+date=2021-12-13";
+  version = "0.pre+date=2022-10-03";

  src = fetchFromGitHub {
    owner = "mlochbaum";
    repo = "BQN";
-    rev = "2c2e86e10ff963a6aefa14f76fd8833ce3c9157c";
-    hash = "sha256-iAlDXGlHTeI6+r/QKFiBHhj5A+FgUy7JFrCpAwpyVQU=";
+    rev = "1518205cceeb1fef27c584d24e92b189ffd234f4";
+    hash = "sha256:1pyk331ymbs2fv9jxmbv28yvk9mr2mcni1dsja6fzkk1jrd767hy";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/development/interpreters/elixir/1.14.nix
+++ b/pkgs/development/interpreters/elixir/1.14.nix
@ -1,8 +1,8 @@
 { mkDerivation }:

 mkDerivation {
-  version = "1.14.0";
-  sha256 = "16rc4qaykddda6ax5f8zw70yhapgwraqbgx5gp3f40dvfax3d51l";
-  # https://hexdocs.pm/elixir/1.14.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
+  version = "1.14.1";
+  sha256 = "sha256-/QQckiRvwmD3gdIo19TXM0bIgdxNx8eQwpd1RnEo35A=";
+  # https://hexdocs.pm/elixir/1.14.1/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
  minimumOTPVersion = "23";
 }
--- a/pkgs/development/interpreters/gnudatalanguage/default.nix
+++ b/pkgs/development/interpreters/gnudatalanguage/default.nix
@ -18,13 +18,16 @@
 , udunits
 , eigen
 , pslib
-, eccodes
-, glpk
 , libpng
 , plplot
 , libtiff
 , libgeotiff
 , libjpeg
+  # eccodes is broken on darwin
+, enableGRIB ? stdenv.isLinux
+, eccodes
+, enableGLPK ? stdenv.isLinux
+, glpk
  # We enable it in hdf4 and use libtirpc as a dependency here from the passthru
  # of hdf4
 , enableLibtirpc ? stdenv.isLinux
@ -53,9 +56,10 @@
 , netcdf-forced ? null
 , plplot-forced ? null
  # wxWidgets is preferred over X11 for this project but we only have it on Linux
-  # and Darwin. Also, we use the wxWidgets dependency here from the passthru of
-  # plplot.
+  # and Darwin.
 , enableWX ? (stdenv.isLinux || stdenv.isDarwin)
+, wxGTK32
+, Cocoa
  # X11: OFF by default for platform consistency. Use X where WX is not available
 , enableXWin ? (!stdenv.isLinux && !stdenv.isDarwin)
 }:
@ -128,8 +132,6 @@ stdenv.mkDerivation rec {
    udunits
    eigen
    pslib
-    eccodes
-    glpk
    libpng
    libtiff
    libgeotiff
@ -139,7 +141,10 @@ stdenv.mkDerivation rec {
    netcdf-custom
    plplot-with-drivers
  ] ++ lib.optional enableXWin plplot-with-drivers.libX11
-  ++ lib.optional enableWX plplot-with-drivers.wxWidgets
+  ++ lib.optional enableGRIB eccodes
+  ++ lib.optional enableGLPK glpk
+  ++ lib.optional enableWX wxGTK32
+  ++ lib.optional (enableWX && stdenv.isDarwin) Cocoa
  ++ lib.optional enableMPI mpi
  ++ lib.optional enableLibtirpc hdf4-custom.libtirpc
  ++ lib.optional enableSzip szip;
@ -156,19 +161,29 @@ stdenv.mkDerivation rec {
    ++ [ (if enableHDF5 then "-DHDF5DIR=${hdf5-custom}" else "-DHDF5=OFF") ]
    ++ lib.optional (!enableNetCDF) "-DNETCDF=OFF"
    ++ lib.optional (!enablePlplotDrivers) "-DINTERACTIVE_GRAPHICS=OFF"
+    ++ lib.optional (!enableGRIB) "-DGRIB=OFF"
+    ++ lib.optional (!enableGLPK) "-DGLPK=OFF"
    ++ lib.optional (!enableWX) "-DWXWIDGETS=OFF"
    ++ lib.optional enableSzip "-DSZIPDIR=${szip}"
    ++ lib.optionals enableXWin [ "-DX11=ON" "-DX11DIR=${plplot-with-drivers.libX11}" ]
    ++ lib.optionals enableMPI [ "-DMPI=ON" "-DMPIDIR=${mpi}" ];

-  doCheck = true;
+  # Tests are failing on Hydra:
+  # ./src/common/dpycmn.cpp(137): assert ""IsOk()"" failed in GetClientArea(): invalid wxDisplay object
+  doCheck = stdenv.isLinux;

  # Opt-out unstable tests
  # https://github.com/gnudatalanguage/gdl/issues/482
  # https://github.com/gnudatalanguage/gdl/issues/1079
  # https://github.com/gnudatalanguage/gdl/issues/460
  preCheck = ''
-    checkFlagsArray+=("ARGS=-E 'test_tic_toc.pro|test_byte_conversion.pro|test_bytscl.pro|test_call_external.pro'")
+    checkFlagsArray+=("ARGS=-E '${lib.concatMapStringsSep "|" (test: test + ".pro") [
+      "test_byte_conversion"
+      "test_bytscl"
+      "test_call_external"
+      "test_tic_toc"
+      "test_timestamp"
+    ]}'")
  '';

  passthru = {
--- a/pkgs/development/interpreters/python/rustpython/default.nix
+++ b/pkgs/development/interpreters/python/rustpython/default.nix
@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "rustpython";
-  version = "unstable-2021-12-09";
+  version = "unstable-2022-10-11";

  src = fetchFromGitHub {
    owner = "RustPython";
    repo = "RustPython";
-    rev = "db3b3127df34ff5dd569301aa36ed71ae5624e4e";
-    sha256 = "sha256-YwGfXs3A5L/18mHnnWubPU3Y8EI9uU3keJ2HJnnTwv0=";
+    rev = "273ffd969ca6536df06d9f69076c2badb86f8f8c";
+    sha256 = "sha256-t/3++EeP7a8t2H0IEPLogBri7+6u+2+v+lNb4/Ty1/w=";
  };

-  cargoHash = "sha256-T85kiPG80oZ4mwpb8Ag40wDHKx2Aens+gM7NGXan5lM=";
+  cargoHash = "sha256-Pv7SK64+eoK1VUxDh1oH0g1veWoIvBhiZE9JI/alXJ4=";

  # freeze the stdlib into the rustpython binary
  cargoBuildFlags = "--features=freeze-stdlib";
--- a/pkgs/development/libraries/gtk/4.x.nix
+++ b/pkgs/development/libraries/gtk/4.x.nix
@ -93,6 +93,7 @@ stdenv.mkDerivation rec {
    sassc
    gi-docgen
    libxml2 # for xmllint
+  ] ++ lib.optionals waylandSupport [
    wayland-scanner
  ] ++ setupHooks;

--- a/pkgs/development/libraries/nuspell/default.nix
+++ b/pkgs/development/libraries/nuspell/default.nix
@ -1,35 +1,32 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, icu, catch2, pandoc }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, icu, catch2 }:

 stdenv.mkDerivation rec {
  pname = "nuspell";
-  version = "5.0.1";
+  version = "5.1.2";

  src = fetchFromGitHub {
    owner = "nuspell";
    repo = "nuspell";
    rev = "v${version}";
-    sha256 = "sha256-ogA7ycqdMUTN/KHV2oZzytnhZ7XVuhx+ArXZqLlmwjk=";
+    sha256 = "sha256-nGC8Um9GutJZXlUcUCK0IiHxMaZmeoe4febw/jC2dRU=";
  };

-  nativeBuildInputs = [ cmake pkg-config pandoc ];
+  nativeBuildInputs = [ cmake pkg-config ];
  buildInputs = [ icu ];

-  outputs = [ "out" "lib" "dev" "man" ];
+  outputs = [ "out" "lib" "dev" ];

  postPatch = ''
    rm -rf external/Catch2
    ln -sf ${catch2.src} external/Catch2
  '';

-  postInstall = ''
-    rm -rf $out/share/doc
-  '';
-
  meta = with lib; {
    description = "Free and open source C++ spell checking library";
    homepage = "https://nuspell.github.io/";
    platforms = platforms.all;
    maintainers = with maintainers; [ fpletz ];
    license = licenses.lgpl3Plus;
+    changelog = "https://github.com/nuspell/nuspell/blob/v${version}/CHANGELOG.md";
  };
 }
--- a/pkgs/development/libraries/plplot/default.nix
+++ b/pkgs/development/libraries/plplot/default.nix
@ -3,14 +3,13 @@
 , fetchurl
 , cmake
 , enableWX ? false
-, wxGTK31, wxmac
+, wxGTK32
+, Cocoa
 , enableXWin ? false
 , libX11
 }:

-let
-  wxWidgets = (if stdenv.isDarwin then wxmac else wxGTK31);
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
  pname   = "plplot";
  version = "5.15.0";

@ -21,13 +20,13 @@ in stdenv.mkDerivation rec {

  nativeBuildInputs = [ cmake ];

-  buildInputs = lib.optional enableWX wxWidgets
+  buildInputs = lib.optional enableWX wxGTK32
+    ++ lib.optional (enableWX && stdenv.isDarwin) Cocoa
    ++ lib.optional enableXWin libX11;

  passthru = {
    inherit
      enableWX
-      wxWidgets
      enableXWin
      libX11
    ;
--- a/pkgs/development/libraries/qrencode/default.nix
+++ b/pkgs/development/libraries/qrencode/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, SDL2, libpng, libiconv }:
+{ lib, stdenv, fetchurl, pkg-config, SDL2, libpng, libiconv, libobjc }:

 stdenv.mkDerivation rec {
  pname = "qrencode";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ SDL2 libpng ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
+  buildInputs = [ SDL2 libpng ] ++ lib.optionals stdenv.isDarwin [ libiconv libobjc ];

  configureFlags = [
    "--with-tests"
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@ -3021,6 +3021,39 @@ buildLuarocksPackage {
  };
 }) {};

+vusted = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
+, fetchgit, busted
+}:
+buildLuarocksPackage {
+  pname = "vusted";
+  version = "2.1.1-1";
+  knownRockspec = (fetchurl {
+    url    = "mirror://luarocks/vusted-2.1.1-1.rockspec";
+    sha256 = "12zw09ib3mmwh1kvcj228dhws2ldvwzymr7qbsq6l5kysaahhjm3";
+  }).outPath;
+  src = fetchgit ( removeAttrs (builtins.fromJSON ''{
+  "url": "https://github.com/notomo/vusted.git",
+  "rev": "9607444b9e259b82c0615caabb5fea8cea918edc",
+  "date": "2022-09-12T21:55:42+09:00",
+  "path": "/nix/store/pb5inf25lr63bbc1mvx8aqlh83i4ynwd-vusted",
+  "sha256": "0wv5lmzf36ga0lmyh0xaw4g2jz9hmw4766xmpznbhn2p64lm9kyl",
+  "fetchLFS": false,
+  "fetchSubmodules": true,
+  "deepClone": false,
+  "leaveDotGit": false
+}
+ '') ["date" "path"]) ;
+
+  propagatedBuildInputs = [ busted ];
+
+  meta = {
+    homepage = "https://github.com/notomo/vusted";
+    description = "`busted` wrapper for testing neovim plugin";
+    maintainers = with lib.maintainers; [ figsoda ];
+    license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+  };
+}) {};
+

 }
 /* GENERATED - do not edit this file */
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@ -514,6 +514,13 @@ with prev;
    '';
  });

+  vusted = prev.vusted.overrideAttrs (_: {
+    # make sure vusted_entry.vim doesn't get wrapped
+    postInstall = ''
+      chmod -x $out/bin/vusted_entry.vim
+    '';
+  });
+
  # TODO just while testing, remove afterwards
  # toVimPlugin should do it instead
  gitsigns-nvim = prev.gitsigns-nvim.overrideAttrs (oa: {
--- a/pkgs/development/ocaml-modules/bigstringaf/default.nix
+++ b/pkgs/development/ocaml-modules/bigstringaf/default.nix
@ -2,17 +2,15 @@

 buildDunePackage rec {
  pname = "bigstringaf";
-  version = "0.7.0";
+  version = "0.9.0";

-  useDune2 = true;
-
-  minimumOCamlVersion = "4.03";
+  minimalOCamlVersion = "4.08";

  src = fetchFromGitHub {
    owner = "inhabitedtype";
    repo = pname;
    rev = version;
-    sha256 = "1q1sqxzdnlrpl95ccrhl7lwy3zswgd9rbn19ildclh0lyi2vazbj";
+    sha256 = "sha256-HXPjnE56auy2MI6HV2XuBX/VeqsO50HFzTul17lKEqE=";
  };

  # This currently fails with dune
@ -20,8 +18,7 @@ buildDunePackage rec {

  nativeBuildInputs = [ pkg-config ];
  checkInputs = [ alcotest ];
-  propagatedBuildInputs = [ bigarray-compat ];
-  doCheck = lib.versionAtLeast ocaml.version "4.08";
+  doCheck = true;

  meta = {
    description = "Bigstring intrinsics and fast blits based on memcpy/memmove";
--- a/pkgs/development/ocaml-modules/bls12-381/default.nix
+++ b/pkgs/development/ocaml-modules/bls12-381/default.nix
@ -1,14 +1,17 @@
-{ lib, buildDunePackage, fetchFromGitLab, ff-sig, zarith }:
+{ lib, buildDunePackage, fetchFromGitLab, ff-sig, zarith
+, zarith_stubs_js, integers_stubs_js, integers, hex
+, ff-pbt, bisect_ppx, alcotest
+}:

 buildDunePackage rec {
  pname = "bls12-381";
-  version = "1.1.0";
+  version = "3.0.0";

  src = fetchFromGitLab {
    owner = "dannywillems";
    repo = "ocaml-bls12-381";
-    rev = "22247018c0651ea62ae898c8ffcc388cc73f758f";
-    sha256 = "ku6Rc+/lwFDoHTZTxgkhiF+kLkagi7944ntcu9vXWgI=";
+    rev = "4bbc7818e9ccd025c5e32006f8a9de370739bc43";
+    sha256 = "/Rw0mQvTfHyPqosWFPv+1FoY5Dwuwv9mB8UYjjHxodE=";
  };

  useDune2 = true;
@ -18,6 +21,16 @@ buildDunePackage rec {
  propagatedBuildInputs = [
    ff-sig
    zarith
+    zarith_stubs_js
+    integers_stubs_js
+    integers
+    hex
+  ];
+
+  checkInputs = [
+    ff-pbt
+    bisect_ppx
+    alcotest
  ];

  doCheck = true;
--- a/pkgs/development/ocaml-modules/bls12-381/unix.nix
+++ b/pkgs/development/ocaml-modules/bls12-381/unix.nix
@ -1,34 +0,0 @@
-{ lib
-, buildDunePackage
-, bls12-381
-, hex
-, integers
-, zarith
-, alcotest
-, bisect_ppx
-, ff-pbt
-}:
-
-buildDunePackage {
-  pname = "bls12-381-unix";
-
-  inherit (bls12-381) version src useDune2 doCheck;
-
-  propagatedBuildInputs = [
-    bls12-381
-    hex
-    integers
-    zarith
-  ];
-
-  checkInputs = [
-    alcotest
-    bisect_ppx
-    ff-pbt
-  ];
-
-  meta = {
-    description = "UNIX version of BLS12-381 primitives implementing the virtual package bls12-381";
-    license = lib.licenses.mit;
-  };
-}
--- a/pkgs/development/ocaml-modules/carton/default.nix
+++ b/pkgs/development/ocaml-modules/carton/default.nix
@ -1,20 +1,19 @@
 { lib, buildDunePackage, fetchurl
-, ke, duff, decompress, cstruct, optint, bigstringaf, stdlib-shims
-, bigarray-compat, checkseum, logs, psq, fmt
-, result, rresult, fpath, base64, bos, digestif, mmap, alcotest
+, ke, duff, decompress, cstruct, optint, bigstringaf
+, checkseum, logs, psq, fmt
+, result, rresult, fpath, base64, bos, digestif, alcotest
 , crowbar, alcotest-lwt, lwt, findlib, mirage-flow, cmdliner, hxd
 }:

 buildDunePackage rec {
  pname = "carton";
-  version = "0.4.3";
+  version = "0.4.4";

-  useDune2 = true;
  minimalOCamlVersion = "4.08";

  src = fetchurl {
-    url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz";
-    sha256 = "sha256:0qz9ds5761wx4m7ly3av843b6dii7lmjpx2nnyijv8rm8aw95jgr";
+    url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/git-${pname}-v${version}.tbz";
+    sha256 = "sha256-7mgCgu87Cn4XhjEhonlz9lhgTw0Cu5hnxNJ1wXr+Qhw=";
  };

  # remove changelogs for mimic and the git* packages
@ -25,7 +24,6 @@ buildDunePackage rec {
  buildInputs = [
    cmdliner
    digestif
-    mmap
    result
    rresult
    fpath
@ -39,8 +37,6 @@ buildDunePackage rec {
    cstruct
    optint
    bigstringaf
-    stdlib-shims
-    bigarray-compat
    checkseum
    logs
    psq
--- a/pkgs/development/ocaml-modules/carton/git.nix
+++ b/pkgs/development/ocaml-modules/carton/git.nix
@ -8,7 +8,7 @@
 buildDunePackage {
  pname = "carton-git";

-  inherit (carton) version src useDune2 postPatch;
+  inherit (carton) version src postPatch;

  propagatedBuildInputs = [
    carton
--- a/pkgs/development/ocaml-modules/carton/lwt.nix
+++ b/pkgs/development/ocaml-modules/carton/lwt.nix
@ -10,7 +10,7 @@
 buildDunePackage {
  pname = "carton-lwt";

-  inherit (carton) version src useDune2 postPatch;
+  inherit (carton) version src postPatch;

  propagatedBuildInputs = [
    carton
--- a/pkgs/development/ocaml-modules/cstruct/async.nix
+++ b/pkgs/development/ocaml-modules/cstruct/async.nix
@ -1,11 +1,13 @@
-{ lib, buildDunePackage, cstruct, async_unix }:
+{ lib, buildDunePackage, cstruct, async_unix, async, core }:

 buildDunePackage rec {
  pname = "cstruct-async";
-  inherit (cstruct) src version meta useDune2;
+  inherit (cstruct) src version meta;

  propagatedBuildInputs = [
    async_unix
+    async
    cstruct
+    core
  ];
 }
--- a/pkgs/development/ocaml-modules/cstruct/default.nix
+++ b/pkgs/development/ocaml-modules/cstruct/default.nix
@ -1,23 +1,20 @@
-{ lib, fetchurl, buildDunePackage, bigarray-compat, alcotest, ocaml }:
+{ lib, fetchurl, buildDunePackage, fmt, alcotest, crowbar }:

 buildDunePackage rec {
  pname = "cstruct";
-  version = "6.0.1";
+  version = "6.1.1";

-  useDune2 = true;
-
-  minimumOCamlVersion = "4.03";
+  minimalOCamlVersion = "4.08";

  src = fetchurl {
-    url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-v${version}.tbz";
-    sha256 = "4a67bb8f042753453c59eabf0e47865631253ba694091ce6062aac05d47a9bed";
+    url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-${version}.tbz";
+    sha256 = "sha256-G3T5hw9qfuYAiSRZBxbdUzpyijyhC7GNqf6ovkZ/UY0=";
  };

-  propagatedBuildInputs = [ bigarray-compat ];
+  buildInputs = [ fmt ];

-  # alcotest isn't available for OCaml < 4.08 due to fmt
-  doCheck = lib.versionAtLeast ocaml.version "4.08";
-  checkInputs = [ alcotest ];
+  doCheck = true;
+  checkInputs = [ alcotest crowbar ];

  meta = {
    description = "Access C-like structures directly from OCaml";
--- a/pkgs/development/ocaml-modules/cstruct/lwt.nix
+++ b/pkgs/development/ocaml-modules/cstruct/lwt.nix
@ -4,11 +4,11 @@ if lib.versionOlder (cstruct.version or "1") "3"
 then cstruct
 else

-buildDunePackage {
-  pname = "cstruct-lwt";
-  inherit (cstruct) version src useDune2 meta;
+  buildDunePackage {
+    pname = "cstruct-lwt";
+    inherit (cstruct) version src meta;

-  minimumOCamlVersion = "4.03";
+    minimalOCamlVersion = "4.08";

-  propagatedBuildInputs = [ cstruct lwt ];
-}
+    propagatedBuildInputs = [ cstruct lwt ];
+  }
--- a/pkgs/development/ocaml-modules/cstruct/ppx.nix
+++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix
@ -8,7 +8,7 @@ else

 buildDunePackage {
  pname = "ppx_cstruct";
-  inherit (cstruct) version src useDune2 meta;
+  inherit (cstruct) version src meta;

  minimalOCamlVersion = "4.08";

--- a/pkgs/development/ocaml-modules/cstruct/sexp.nix
+++ b/pkgs/development/ocaml-modules/cstruct/sexp.nix
@ -6,12 +6,11 @@ else

 buildDunePackage rec {
  pname = "cstruct-sexp";
-  inherit (cstruct) version src useDune2 meta;
+  inherit (cstruct) version src meta;

-  minimumOCamlVersion = "4.03";
+  minimalOCamlVersion = "4.08";

-  # alcotest is only available on OCaml >= 4.08 due to fmt
-  doCheck = lib.versionAtLeast ocaml.version "4.08";
+  doCheck = true;
  checkInputs = [ alcotest ];

  propagatedBuildInputs = [ cstruct sexplib ];
--- a/pkgs/development/ocaml-modules/cstruct/unix.nix
+++ b/pkgs/development/ocaml-modules/cstruct/unix.nix
@ -4,11 +4,11 @@ if lib.versionOlder (cstruct.version or "1") "3"
 then cstruct
 else

-buildDunePackage {
-  pname = "cstruct-unix";
-  inherit (cstruct) version src useDune2 meta;
+  buildDunePackage {
+    pname = "cstruct-unix";
+    inherit (cstruct) version src meta;

-  minimumOCamlVersion = "4.06";
+    minimalOCamlVersion = "4.08";

-  propagatedBuildInputs = [ cstruct ];
-}
+    propagatedBuildInputs = [ cstruct ];
+  }
--- a/pkgs/development/ocaml-modules/data-encoding/default.nix
+++ b/pkgs/development/ocaml-modules/data-encoding/default.nix
@ -1,30 +1,36 @@
 { lib
 , fetchFromGitLab
 , buildDunePackage
+, ppx_hash
+, either
 , ezjsonm
 , zarith
+, zarith_stubs_js
 , hex
 , json-data-encoding
 , json-data-encoding-bson
 , alcotest
 , crowbar
+, ppx_expect
 }:

 buildDunePackage {
  pname = "data-encoding";
-  version = "0.4.0";
+  version = "0.5.3";

  src = fetchFromGitLab {
    owner = "nomadic-labs";
    repo = "data-encoding";
-    rev = "v0.4";
-    sha256 = "1f88l9azpfk730hps5v6zlg4yyyyhj1gl27qy3cbbkzjc82d2rhx";
+    rev = "v0.5.3";
+    sha256 = "sha256-HMNpjh5x7vU/kXQNRjJtOvShEENoNuxjNNPBJfm+Rhg=";
  };
-  useDune2 = true;

  propagatedBuildInputs = [
+    either
    ezjsonm
+    ppx_hash
    zarith
+    zarith_stubs_js
    hex
    json-data-encoding
    json-data-encoding-bson
@ -33,6 +39,7 @@ buildDunePackage {
  checkInputs = [
    alcotest
    crowbar
+    ppx_expect
  ];

  doCheck = true;
--- a/pkgs/development/ocaml-modules/decompress/default.nix
+++ b/pkgs/development/ocaml-modules/decompress/default.nix
@ -1,25 +1,23 @@
-{ lib, fetchurl, buildDunePackage, ocaml
-, checkseum, bigarray-compat, optint, cmdliner
-, bigstringaf, alcotest, camlzip, base64, ctypes, fmt
+{ lib, fetchurl, buildDunePackage
+, checkseum, optint, cmdliner
+, bigstringaf, alcotest, camlzip, base64, ctypes, fmt, crowbar, rresult
 }:

 buildDunePackage rec {
-  version = "1.4.2";
  pname = "decompress";
+  version = "1.5.1";

-  minimumOCamlVersion = "4.07";
-
-  useDune2 = true;
+  minimalOCamlVersion = "4.08";

  src = fetchurl {
-    url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
-    sha256 = "822f125b46c87f4a902c334db8c86d4d5f33ebe978e93c40351a4d3269b95225";
+    url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-${version}.tbz";
+    sha256 = "sha256-y/OVojFxhksJQQvvtS38SF7ZnMEQhAtwDey0ISwypP4=";
  };

  buildInputs = [ cmdliner ];
-  propagatedBuildInputs = [ optint bigarray-compat checkseum ];
-  checkInputs = [ alcotest bigstringaf ctypes fmt camlzip base64 ];
-  doCheck = lib.versionAtLeast ocaml.version "4.08";
+  propagatedBuildInputs = [ optint checkseum ];
+  checkInputs = [ alcotest bigstringaf ctypes fmt camlzip base64 crowbar rresult ];
+  doCheck = true;

  meta = {
    description = "Pure OCaml implementation of Zlib";
--- a/pkgs/development/ocaml-modules/git/cohttp-unix.nix
+++ b/pkgs/development/ocaml-modules/git/cohttp-unix.nix
@ -1,17 +0,0 @@
-{ buildDunePackage, git, git-cohttp
-, cohttp-lwt-unix, cohttp-lwt, fmt, lwt, result, rresult, uri
-}:
-
-buildDunePackage {
-  pname = "git-cohttp-unix";
-
-  inherit (git) version src minimumOCamlVersion useDune2;
-
-  propagatedBuildInputs = [
-    git git-cohttp cohttp-lwt-unix cohttp-lwt fmt lwt result rresult uri
-  ];
-
-  meta = git.meta // {
-    description = "A package to use HTTP-based ocaml-git with Unix backend";
-  };
-}
--- a/pkgs/development/ocaml-modules/git/cohttp.nix
+++ b/pkgs/development/ocaml-modules/git/cohttp.nix
@ -1,19 +0,0 @@
-{ buildDunePackage, git
-, cohttp, cohttp-lwt, fmt, lwt, result, rresult, uri
-, alcotest, alcotest-lwt, bigstringaf, cstruct, logs
-, mirage-flow, ke
-}:
-
-buildDunePackage rec {
-  pname = "git-cohttp";
-
-  inherit (git) version minimumOCamlVersion src useDune2;
-
-  propagatedBuildInputs = [
-    git cohttp cohttp-lwt fmt lwt result rresult uri
-  ];
-
-  meta = git.meta // {
-    description = "A package to use HTTP-based ocaml-git with Unix backend";
-  };
-}
--- a/pkgs/development/ocaml-modules/git/default.nix
+++ b/pkgs/development/ocaml-modules/git/default.nix
@ -1,21 +1,20 @@
 { stdenv, lib, fetchurl, buildDunePackage
-, alcotest, mtime, mirage-crypto-rng, tls, git-binary
-, angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt, checkseum
+, alcotest, mirage-crypto-rng, git-binary
+, angstrom, astring, cstruct, decompress, digestif, encore, fmt, checkseum
 , fpath, ke, logs, lwt, ocamlgraph, uri, rresult, base64, hxd
 , result, bigstringaf, optint, mirage-flow, domain-name, emile
-, mimic, carton, carton-lwt, carton-git, ipaddr, psq, crowbar, alcotest-lwt
+, mimic, carton, carton-lwt, carton-git, ipaddr, psq, crowbar, alcotest-lwt, cmdliner
 }:

 buildDunePackage rec {
  pname = "git";
-  version = "3.5.0";
+  version = "3.9.1";

-  minimumOCamlVersion = "4.08";
-  useDune2 = true;
+  minimalOCamlVersion = "4.08";

  src = fetchurl {
    url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
-    sha256 = "bcd5a0aef9957193cbaeeb17c22201e5ca4e815e67bbc696e88efdb38c25ec03";
+    sha256 = "sha256-OyeMW5gsq4fMEWRmhzPq2qardFZtMjoQk6mMKz5+Ds4=";
  };

  # remove changelog for the carton package
@ -27,12 +26,12 @@ buildDunePackage rec {
    base64
  ];
  propagatedBuildInputs = [
-    angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath
+    angstrom astring checkseum cstruct decompress digestif encore fmt fpath
    ke logs lwt ocamlgraph uri rresult result bigstringaf optint mirage-flow
    domain-name emile mimic carton carton-lwt carton-git ipaddr psq hxd
  ];
  checkInputs = [
-    alcotest alcotest-lwt mtime mirage-crypto-rng tls git-binary crowbar
+    alcotest alcotest-lwt mirage-crypto-rng git-binary crowbar cmdliner
  ];
  doCheck = !stdenv.isAarch64;

--- a/pkgs/development/ocaml-modules/git/mirage.nix
+++ b/pkgs/development/ocaml-modules/git/mirage.nix
@ -0,0 +1,95 @@
+{ lib, buildDunePackage
+, git
+, mimic
+, mimic-happy-eyeballs
+, base64
+, git-paf
+, awa
+, awa-mirage
+, dns
+, dns-client
+, tls
+, tls-mirage
+, uri
+, hex
+, happy-eyeballs-mirage
+, happy-eyeballs
+, ca-certs-nss
+, mirage-crypto
+, ptime
+, x509
+, cstruct
+, tcpip
+, domain-name
+, fmt
+, ipaddr
+, lwt
+, mirage-clock
+, mirage-flow
+, mirage-random
+, mirage-time
+, result
+, rresult
+, alcotest
+, alcotest-lwt
+, bigstringaf
+, logs
+, ke
+}:
+
+buildDunePackage {
+  pname = "git-mirage";
+
+  inherit (git) version src;
+
+  minimalOCamlVersion = "4.08";
+
+  buildInputs = [
+    dns
+    dns-client
+    happy-eyeballs-mirage
+    ipaddr
+    mirage-random
+    rresult
+  ];
+
+  propagatedBuildInputs = [
+    git
+    mimic
+    mimic-happy-eyeballs
+    base64
+    git-paf
+    awa
+    awa-mirage
+    tls
+    tls-mirage
+    uri
+    hex
+    happy-eyeballs
+    ca-certs-nss
+    mirage-crypto
+    ptime
+    x509
+    cstruct
+    tcpip
+    domain-name
+    fmt
+    lwt
+    mirage-clock
+    mirage-flow
+    mirage-time
+    result
+  ];
+
+  checkInputs = [
+    alcotest
+    alcotest-lwt
+    bigstringaf
+    logs
+    ke
+  ];
+
+  meta = git.meta // {
+    description = "A package to use ocaml-git with MirageOS backend";
+  };
+}
--- a/pkgs/development/ocaml-modules/git/paf.nix
+++ b/pkgs/development/ocaml-modules/git/paf.nix
@ -8,7 +8,6 @@
 , logs
 , lwt
 , mirage-clock
-, mirage-stack
 , mirage-time
 , result
 , rresult
@ -25,7 +24,9 @@
 buildDunePackage {
  pname = "git-paf";

-  inherit (git) version src minimumOCamlVersion useDune2;
+  inherit (git) version src;
+
+  minimalOCamlVersion = "4.08";

  propagatedBuildInputs = [
    git
@ -39,7 +40,6 @@ buildDunePackage {
    ipaddr
    logs
    mirage-clock
-    mirage-stack
    mirage-time
    tls
    uri
--- a/pkgs/development/ocaml-modules/git/unix.nix
+++ b/pkgs/development/ocaml-modules/git/unix.nix
@ -1,37 +1,38 @@
 { buildDunePackage, git
-, mmap, rresult, result, bigstringaf
-, fmt, bos, fpath, uri, digestif, logs, lwt, git-cohttp-unix
+, rresult, result, bigstringaf
+, fmt, bos, fpath, uri, digestif, logs, lwt
 , mirage-clock, mirage-clock-unix, astring, awa, cmdliner
-, cohttp-lwt-unix, decompress, domain-name, ipaddr, mtime
-, tcpip, awa-mirage, mirage-flow
+, decompress, domain-name, ipaddr, mtime
+, tcpip, awa-mirage, mirage-flow, mirage-unix
 , alcotest, alcotest-lwt, base64, cstruct
 , ke, mirage-crypto-rng, ocurl, git-binary
 , ptime, mimic, ca-certs-nss, tls, tls-mirage
-, cacert
+, cacert, happy-eyeballs-lwt, git-mirage
 }:

 buildDunePackage {
  pname = "git-unix";
-  inherit (git) version src minimumOCamlVersion;
+  inherit (git) version src;

-  useDune2 = true;
+  minimalOCamlVersion = "4.08";

  buildInputs = [
-    awa awa-mirage cmdliner git-cohttp-unix
-    mirage-clock mirage-clock-unix tcpip
+    awa awa-mirage cmdliner
+    mirage-clock tcpip
  ];
  propagatedBuildInputs = [
-    mmap rresult result bigstringaf
-    fmt bos fpath uri digestif logs lwt
-    astring cohttp-lwt-unix decompress
-    domain-name ipaddr mtime mirage-flow
+    rresult result bigstringaf
+    fmt bos fpath digestif logs lwt
+    astring decompress
+    domain-name ipaddr mirage-flow mirage-unix
    cstruct ptime mimic ca-certs-nss
-    tls tls-mirage git
+    tls tls-mirage git happy-eyeballs-lwt
+    git-mirage mirage-clock-unix
  ];
  checkInputs = [
    alcotest alcotest-lwt base64 ke
    mirage-crypto-rng git-binary
-    cohttp-lwt-unix
+    uri mtime
    cacert # sets up NIX_SSL_CERT_FILE
  ];
  doCheck = true;
@ -39,7 +40,5 @@ buildDunePackage {
  meta = {
    description = "Unix backend for the Git protocol(s)";
    inherit (git.meta) homepage license maintainers;
-    # Not compatible with cmdliner ≥ 1.1
-    broken = true;
  };
 }
--- a/pkgs/development/ocaml-modules/irmin/chunk.nix
+++ b/pkgs/development/ocaml-modules/irmin/chunk.nix
@ -1,11 +1,11 @@
-{ lib, buildDunePackage, irmin, irmin-test, alcotest }:
+{ lib, buildDunePackage, irmin, irmin-test, fmt, logs, lwt, alcotest }:

 buildDunePackage rec {

  pname = "irmin-chunk";
-  inherit (irmin) version src useDune2;
+  inherit (irmin) version src strictDeps;

-  propagatedBuildInputs = [ irmin ];
+  propagatedBuildInputs = [ irmin fmt logs lwt ];

  doCheck = true;
  checkInputs = [ alcotest irmin-test ];
--- a/pkgs/development/ocaml-modules/irmin/containers.nix
+++ b/pkgs/development/ocaml-modules/irmin/containers.nix
@ -1,19 +1,19 @@
 { buildDunePackage
-, irmin, irmin-unix, irmin-git, ppx_irmin, lwt, mtime
+, irmin, irmin-fs, ppx_irmin, lwt, mtime
 , alcotest, alcotest-lwt, cacert
 }:

 buildDunePackage {
  pname = "irmin-containers";

-  inherit (ppx_irmin) src version useDune2;
+  inherit (ppx_irmin) src version strictDeps;

  nativeBuildInputs = [
    ppx_irmin
  ];

  propagatedBuildInputs = [
-    irmin irmin-unix irmin-git ppx_irmin lwt mtime
+    irmin irmin-fs ppx_irmin lwt mtime
  ];

  doCheck = true;
--- a/pkgs/development/ocaml-modules/irmin/default.nix
+++ b/pkgs/development/ocaml-modules/irmin/default.nix
@ -1,33 +1,41 @@
 { lib, buildDunePackage
 , astring, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri
-, repr, ppx_irmin, bheap, uutf
+, repr, ppx_irmin, bheap, uutf, mtime, lwt, optint
+, vector, hex, alcotest, qcheck-alcotest
 }:

 buildDunePackage {
  pname = "irmin";

-  inherit (ppx_irmin) src version;
+  inherit (ppx_irmin) src version strictDeps;

-  useDune2 = true;
-  minimumOCamlVersion = "4.08";
+  minimalOCamlVersion = "4.08";

  propagatedBuildInputs = [
    astring
+    bheap
    digestif
    fmt
    jsonm
    logs
-    ocaml_lwt
+    lwt
+    mtime
    ocamlgraph
-    uri
-    repr
-    bheap
+    optint
    ppx_irmin
+    repr
+    uri
    uutf
  ];

-  # circular dependency on irmin-mem
-  doCheck = false;
+  checkInputs = [
+    vector
+    hex
+    alcotest
+    qcheck-alcotest
+  ];
+
+  doCheck = true;

  meta = ppx_irmin.meta // {
    description = "A distributed database built on the same principles as Git";
--- a/pkgs/development/ocaml-modules/irmin/fs.nix
+++ b/pkgs/development/ocaml-modules/irmin/fs.nix
@ -1,16 +1,15 @@
-{ lib, buildDunePackage, irmin, irmin-test }:
+{ lib, buildDunePackage, irmin, astring, logs, lwt
+, alcotest, irmin-test, irmin-watcher }:

 buildDunePackage rec {

  pname = "irmin-fs";

-  inherit (irmin) version src;
+  inherit (irmin) version src strictDeps;

-  propagatedBuildInputs = [ irmin ];
+  propagatedBuildInputs = [ irmin astring logs lwt ];

-  useDune2 = true;
-
-  checkInputs = lib.optional doCheck irmin-test;
+  checkInputs = [ alcotest irmin-test irmin-watcher ];

  doCheck = true;

@ -19,5 +18,3 @@ buildDunePackage rec {
  };

 }
-
-
--- a/pkgs/development/ocaml-modules/irmin/git.nix
+++ b/pkgs/development/ocaml-modules/irmin/git.nix
@ -1,16 +1,15 @@
 { lib, buildDunePackage
-, git, irmin, irmin-test, ppx_irmin, git-cohttp-unix, git-unix
+, git, irmin, ppx_irmin, git-unix, irmin-watcher
 , digestif, cstruct, fmt, astring, fpath, logs, lwt, uri
-, mtime, alcotest, cacert
+, cohttp-lwt-unix, mimic
+, irmin-test, mtime, alcotest, cacert
 }:

 buildDunePackage {

  pname = "irmin-git";

-  inherit (irmin) version src;
-
-  useDune2 = true;
+  inherit (irmin) version src strictDeps;

  propagatedBuildInputs = [
    git
@ -24,9 +23,13 @@ buildDunePackage {
    logs
    lwt
    uri
+    irmin-watcher
+    git-unix
+    mimic
+    cohttp-lwt-unix
  ];

-  checkInputs = [ mtime alcotest git-cohttp-unix git-unix irmin-test cacert ];
+  checkInputs = [ mtime alcotest irmin-test cacert ];

  doCheck = true;

--- a/pkgs/development/ocaml-modules/irmin/graphql.nix
+++ b/pkgs/development/ocaml-modules/irmin/graphql.nix
@ -1,5 +1,5 @@
-{ lib, buildDunePackage, cohttp-lwt, graphql-cohttp, graphql-lwt, irmin
-, alcotest, alcotest-lwt, logs, yojson, cohttp-lwt-unix, cacert
+{ lib, buildDunePackage, cohttp-lwt, cohttp-lwt-unix, graphql-cohttp, graphql-lwt, irmin, git-unix
+, alcotest, alcotest-lwt, logs, yojson, cacert
 }:

 buildDunePackage rec {
@ -8,26 +8,19 @@ buildDunePackage rec {

  inherit (irmin) version src;

-  useDune2 = true;
-
-  propagatedBuildInputs = [ cohttp-lwt graphql-cohttp graphql-lwt irmin ];
+  propagatedBuildInputs = [ cohttp-lwt cohttp-lwt-unix graphql-cohttp graphql-lwt irmin git-unix ];

  doCheck = true;
+
  checkInputs = [
    alcotest
    alcotest-lwt
    logs
-    cohttp-lwt-unix
    yojson
    cacert
  ];

  meta = irmin.meta // {
    description = "GraphQL server for Irmin";
-    broken = true; # Not compatible with graphql 0.14
  };
-
 }
-
-
-
--- a/pkgs/development/ocaml-modules/irmin/http.nix
+++ b/pkgs/development/ocaml-modules/irmin/http.nix
@ -1,5 +1,6 @@
-{ lib, buildDunePackage, cohttp-lwt, irmin, webmachine
-, checkseum, git-unix, irmin-git, irmin-test, digestif, git-cohttp-unix
+{ lib, buildDunePackage, astring, cohttp-lwt, cohttp-lwt-unix, irmin, webmachine
+, fmt, jsonm, logs, lwt, uri
+, git-unix, irmin-git, irmin-test, irmin-fs, digestif
 , cacert
 }:

@ -7,14 +8,13 @@ buildDunePackage rec {

  pname = "irmin-http";

-  inherit (irmin) version src;
+  inherit (irmin) version src strictDeps;

-  useDune2 = true;

-  propagatedBuildInputs = [ cohttp-lwt irmin webmachine ];
+  propagatedBuildInputs = [ astring cohttp-lwt cohttp-lwt-unix fmt jsonm logs lwt uri irmin webmachine ];

  checkInputs = [
-    digestif checkseum git-cohttp-unix git-unix irmin-git irmin-test cacert
+    digestif git-unix irmin-git irmin-test irmin-fs cacert
  ];

  doCheck = true;
--- a/pkgs/development/ocaml-modules/irmin/layers.nix
+++ b/pkgs/development/ocaml-modules/irmin/layers.nix
@ -1,18 +0,0 @@
-{ buildDunePackage, irmin, mtime, logs, lwt }:
-
-buildDunePackage {
-  pname = "irmin-layers";
-
-  inherit (irmin) version src useDune2;
-
-  propagatedBuildInputs = [
-    irmin
-    mtime
-    logs
-    lwt
-  ];
-
-  meta = irmin.meta // {
-    description = "Combine different Irmin stores into a single, layered store";
-  };
-}
--- a/pkgs/development/ocaml-modules/irmin/mirage-git.nix
+++ b/pkgs/development/ocaml-modules/irmin/mirage-git.nix
@ -6,7 +6,7 @@
 buildDunePackage {
  pname = "irmin-mirage-git";

-  inherit (irmin-mirage) version src useDune2;
+  inherit (irmin-mirage) version src strictDeps;

  propagatedBuildInputs = [
    irmin-mirage
--- a/Show more
+++ b/Show more