Merge master into haskell-updates

2024-11-24 07:53:19 +00:00 · 2023-06-03 00:13:28 +00:00 · 2023-06-03 00:13:28 +00:00 · deb66bc50b
commit deb66bc50b
parent dadde8e3a1 2218e80db0
200 changed files with 7849 additions and 973 deletions
--- a/lib/derivations.nix
+++ b/lib/derivations.nix
@ -31,7 +31,7 @@ in

        (lazyDerivation { inherit derivation; meta.foo = true; }).meta

-    In these expressions, it `derivation` _will_ be evaluated:
+    In these expressions, `derivation` _will_ be evaluated:

        "${lazyDerivation { inherit derivation }}"

--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -177,6 +177,12 @@
    githubId = 12578560;
    name = "Quinn Bohner";
  };
+  _8-bit-fox = {
+    email = "sebastian@markwaerter.de";
+    github = "8-bit-fox";
+    githubId = 43320117;
+    name = "Sebastian Marquardt";
+  };
  _9999years = {
    email = "rbt@fastmail.com";
    github = "9999years";
@ -1633,6 +1639,12 @@
      fingerprint = "2688 0377 C31D 9E81 9BDF  83A8 C8C6 BDDB 3847 F72B";
    }];
  };
+  azd325 = {
+    email = "tim.kleinschmidt@gmail.com";
+    github = "Azd325";
+    githubId = 426541;
+    name = "Tim Kleinschmidt";
+  };
  azuwis = {
    email = "azuwis@gmail.com";
    github = "azuwis";
@ -6376,6 +6388,12 @@
      fingerprint = "45A9 9917 578C D629 9F5F  B5B4 C22D 4DE4 D7B3 2D19";
    }];
  };
+  hitsmaxft = {
+    name = "Bhe Hongtyu";
+    email = "mfthits@gmail.com";
+    github = "hitsmaxft";
+    githubId = 352727;
+  };
  hjones2199 = {
    email = "hjones2199@gmail.com";
    github = "hjones2199";
@ -6901,6 +6919,12 @@
    githubId = 137306;
    name = "Michele Catalano";
  };
+  isaozler = {
+    email = "isaozler@gmail.com";
+    github = "isaozler";
+    githubId = 1378630;
+    name = "Isa Ozler";
+  };
  isgy = {
    name = "isgy";
    email = "isgy@teiyg.com";
@ -10662,6 +10686,12 @@
    githubId = 708570;
    name = "Manuel Mendez";
  };
+  mmusnjak = {
+    email = "marko.musnjak@gmail.com";
+    github = "mmusnjak";
+    githubId = 668956;
+    name = "Marko Mušnjak";
+  };
  mnacamura = {
    email = "m.nacamura@gmail.com";
    github = "mnacamura";
@ -15202,6 +15232,12 @@
    githubId = 38893265;
    name = "StrikerLulu";
  };
+  stteague = {
+    email = "stteague505@yahoo.com";
+    github = "stteague";
+    githubId = 77596767;
+    name = "Scott Teague";
+  };
  stumoss = {
    email = "samoss@gmail.com";
    github = "stumoss";
--- a/nixos/modules/services/misc/nitter.nix
+++ b/nixos/modules/services/misc/nitter.nix
@ -165,14 +165,14 @@ in
        enableDebug = mkEnableOption (lib.mdDoc "request logs and debug endpoints");

        proxy = mkOption {
-          type = types.nullOr types.str;
-          default = null;
+          type = types.str;
+          default = "";
          description = lib.mdDoc "URL to a HTTP/HTTPS proxy.";
        };

        proxyAuth = mkOption {
-          type = types.nullOr types.str;
-          default = null;
+          type = types.str;
+          default = "";
          description = lib.mdDoc "Credentials for proxy.";
        };

--- a/nixos/modules/services/misc/ntfy-sh.nix
+++ b/nixos/modules/services/misc/ntfy-sh.nix
@ -61,8 +61,17 @@ in

      services.ntfy-sh.settings = {
        auth-file = mkDefault "/var/lib/ntfy-sh/user.db";
+        listen-http = mkDefault "127.0.0.1:2586";
+        attachment-cache-dir = mkDefault "/var/lib/ntfy-sh/attachments";
+        cache-file = mkDefault "/var/lib/ntfy-sh/cache-file.db";
      };

+      systemd.tmpfiles.rules = [
+        "f ${cfg.settings.auth-file} 0600 ${cfg.user} ${cfg.group} - -"
+        "d ${cfg.settings.attachment-cache-dir} 0700 ${cfg.user} ${cfg.group} - -"
+        "f ${cfg.settings.cache-file} 0600 ${cfg.user} ${cfg.group} - -"
+      ];
+
      systemd.services.ntfy-sh = {
        description = "Push notifications server";

@ -74,6 +83,7 @@ in
          User = cfg.user;
          StateDirectory = "ntfy-sh";

+          DynamicUser = true;
          AmbientCapabilities = "CAP_NET_BIND_SERVICE";
          PrivateTmp = true;
          NoNewPrivileges = true;
@ -88,6 +98,8 @@ in
          RestrictNamespaces = true;
          RestrictRealtime = true;
          MemoryDenyWriteExecute = true;
+          # Upstream Recommandation
+          LimitNOFILE = 20500;
        };
      };

--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@ -313,7 +313,7 @@ in
    systemd.services.murmur = {
      description = "Murmur Chat Service";
      wantedBy    = [ "multi-user.target" ];
-      after       = [ "network-online.target" ];
+      after       = [ "network.target" ];
      preStart    = ''
        ${pkgs.envsubst}/bin/envsubst \
          -o /run/murmur/murmurd.ini \
--- a/nixos/modules/services/web-apps/pixelfed.nix
+++ b/nixos/modules/services/web-apps/pixelfed.nix
@ -448,7 +448,7 @@ in {
        cfg.nginx
        {
          root = lib.mkForce "${pixelfed}/public/";
-          locations."/".tryFiles = "$uri $uri/ /index.php?query_string";
+          locations."/".tryFiles = "$uri $uri/ /index.php?$query_string";
          locations."/favicon.ico".extraConfig = ''
            access_log off; log_not_found off;
          '';
--- a/nixos/modules/services/web-servers/garage.nix
+++ b/nixos/modules/services/web-servers/garage.nix
@ -49,7 +49,7 @@ in

          replication_mode = mkOption {
            default = "none";
-            type = types.enum ([ "none" "1" "2" "3" 1 2 3 ]);
+            type = types.enum ([ "none" "1" "2" "3" "2-dangerous" "3-dangerous" "3-degraded" 1 2 3 ]);
            apply = v: toString v;
            description = lib.mdDoc "Garage replication mode, defaults to none, see: <https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#replication-mode> for reference.";
          };
@ -80,6 +80,7 @@ in
      after = [ "network.target" "network-online.target" ];
      wants = [ "network.target" "network-online.target" ];
      wantedBy = [ "multi-user.target" ];
+      restartTriggers = [ configFile ];
      serviceConfig = {
        ExecStart = "${cfg.package}/bin/garage server";

--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@ -70,9 +70,9 @@ in
          name = mkDefault "Mint-Y-Aqua";
          package = mkDefault pkgs.cinnamon.mint-themes;
        };
-        iconTheme = mkIf (notExcluded pkgs.cinnamon.mint-x-icons) {
+        iconTheme = mkIf (notExcluded pkgs.cinnamon.mint-y-icons) {
          name = mkDefault "Mint-Y-Aqua";
-          package = mkDefault pkgs.cinnamon.mint-x-icons;
+          package = mkDefault pkgs.cinnamon.mint-y-icons;
        };
        cursorTheme = mkIf (notExcluded pkgs.cinnamon.mint-cursor-themes) {
          name = mkDefault "Bibata-Modern-Classic";
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@ -227,11 +227,16 @@ in
      xdg.icons.enable = true;

      xdg.portal.enable = true;
-      xdg.portal.extraPortals = with pkgs.pantheon; [
+      xdg.portal.extraPortals = [
+        # Some Pantheon apps enforce portal usage, we need this for e.g. notifications.
+        # Currently we have buildPortalsInGnome enabled, if you run into issues related
+        # to https://github.com/flatpak/xdg-desktop-portal/issues/656 please report to us.
+        pkgs.xdg-desktop-portal-gtk
+      ] ++ (with pkgs.pantheon; [
        elementary-files
        elementary-settings-daemon
        xdg-desktop-portal-pantheon
-      ];
+      ]);

      # Override GSettings schemas
      environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
--- a/nixos/modules/virtualisation/amazon-ec2-amis.nix
+++ b/nixos/modules/virtualisation/amazon-ec2-amis.nix
@ -536,5 +536,53 @@ let self = {
  "22.11".us-west-1.aarch64-linux.hvm-ebs = "ami-052d52b9e30a18562";
  "22.11".us-west-2.aarch64-linux.hvm-ebs = "ami-07418b6a4782c9521";

-  latest = self."22.11";
+  # 23.05.426.afc48694f2a
+
+  "23.05".eu-west-1.x86_64-linux.hvm-ebs = "ami-0fc7825fe890f87d1";
+  "23.05".af-south-1.x86_64-linux.hvm-ebs = "ami-0df2f7b42bfbd53e5";
+  "23.05".ap-east-1.x86_64-linux.hvm-ebs = "ami-07ba84d7321f6f4bb";
+  "23.05".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-0e37827874573dbbf";
+  "23.05".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0ff5b3b7738651895";
+  "23.05".ap-northeast-3.x86_64-linux.hvm-ebs = "ami-0a7861571eb44c70c";
+  "23.05".ap-south-1.x86_64-linux.hvm-ebs = "ami-05c4802ca81d7c95b";
+  "23.05".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0aee8193da16bd2db";
+  "23.05".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-008be032289f60d16";
+  "23.05".ap-southeast-3.x86_64-linux.hvm-ebs = "ami-033debde7c1659c96";
+  "23.05".ca-central-1.x86_64-linux.hvm-ebs = "ami-031821b5f83896474";
+  "23.05".eu-central-1.x86_64-linux.hvm-ebs = "ami-0d6ee9d5e1c985df6";
+  "23.05".eu-north-1.x86_64-linux.hvm-ebs = "ami-0cecb1f67b2a837f6";
+  "23.05".eu-south-1.x86_64-linux.hvm-ebs = "ami-0f9fee15eb5a64ac4";
+  "23.05".eu-west-2.x86_64-linux.hvm-ebs = "ami-0e62fef78d2c4f031";
+  "23.05".eu-west-3.x86_64-linux.hvm-ebs = "ami-01a6e4c1659b08390";
+  "23.05".me-south-1.x86_64-linux.hvm-ebs = "ami-0a01a7eeffa8f0fd5";
+  "23.05".sa-east-1.x86_64-linux.hvm-ebs = "ami-09a1760227f929ccf";
+  "23.05".us-east-1.x86_64-linux.hvm-ebs = "ami-07df5833f04703a2a";
+  "23.05".us-east-2.x86_64-linux.hvm-ebs = "ami-04dd2f100d9665df5";
+  "23.05".us-west-1.x86_64-linux.hvm-ebs = "ami-0fe502361fea4216c";
+  "23.05".us-west-2.x86_64-linux.hvm-ebs = "ami-0749963dd978a57c7";
+
+  "23.05".eu-west-1.aarch64-linux.hvm-ebs = "ami-0a0609421e5638005";
+  "23.05".af-south-1.aarch64-linux.hvm-ebs = "ami-05d95a055aba9373e";
+  "23.05".ap-east-1.aarch64-linux.hvm-ebs = "ami-08ae0190b1357465b";
+  "23.05".ap-northeast-1.aarch64-linux.hvm-ebs = "ami-09418b2049c3c9533";
+  "23.05".ap-northeast-2.aarch64-linux.hvm-ebs = "ami-040713ad23b404271";
+  "23.05".ap-northeast-3.aarch64-linux.hvm-ebs = "ami-0c888d6c1d989db68";
+  "23.05".ap-south-1.aarch64-linux.hvm-ebs = "ami-02da38deb21545675";
+  "23.05".ap-southeast-1.aarch64-linux.hvm-ebs = "ami-06df0713468bea276";
+  "23.05".ap-southeast-2.aarch64-linux.hvm-ebs = "ami-0171ee37ae5104c06";
+  "23.05".ap-southeast-3.aarch64-linux.hvm-ebs = "ami-075da61f5fef1fe80";
+  "23.05".ca-central-1.aarch64-linux.hvm-ebs = "ami-0ba8bd0a3d0a596f8";
+  "23.05".eu-central-1.aarch64-linux.hvm-ebs = "ami-0891608ae66031439";
+  "23.05".eu-north-1.aarch64-linux.hvm-ebs = "ami-0a3ad7ef18d595c68";
+  "23.05".eu-south-1.aarch64-linux.hvm-ebs = "ami-0fa86b680aa9a0444";
+  "23.05".eu-west-2.aarch64-linux.hvm-ebs = "ami-0a415791078f05970";
+  "23.05".eu-west-3.aarch64-linux.hvm-ebs = "ami-05d9b146317962e3b";
+  "23.05".me-south-1.aarch64-linux.hvm-ebs = "ami-0019b591acf30aa66";
+  "23.05".sa-east-1.aarch64-linux.hvm-ebs = "ami-030d6c30d91f06cc7";
+  "23.05".us-east-1.aarch64-linux.hvm-ebs = "ami-0a061ca437b63df33";
+  "23.05".us-east-2.aarch64-linux.hvm-ebs = "ami-0bf0b2b8fdfda30e8";
+  "23.05".us-west-1.aarch64-linux.hvm-ebs = "ami-0e75c8f3deb1f842b";
+  "23.05".us-west-2.aarch64-linux.hvm-ebs = "ami-0d0979d889078d036";
+
+  latest = self."23.05";
 }; in self
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@ -1,11 +1,8 @@
 # This module creates a virtual machine from the NixOS configuration.
 # Building the `config.system.build.vm' attribute gives you a command
 # that starts a KVM/QEMU VM running the NixOS configuration defined in
-# `config'.  The Nix store is shared read-only with the host, which
-# makes (re)building VMs very efficient.  However, it also means you
-# can't reconfigure the guest inside the guest - you need to rebuild
-# the VM in the host.  On the other hand, the root filesystem is a
-# read/writable disk image persistent across VM reboots.
+# `config'. By default, the Nix store is shared read-only with the
+# host, which makes (re)building VMs very efficient.

 { config, lib, pkgs, options, ... }:

@ -778,12 +775,11 @@ in
        default = false;
        description =
          lib.mdDoc ''
-            If enabled, the virtual machine will be booted using the
-            regular boot loader (i.e., GRUB 1 or 2).  This allows
-            testing of the boot loader.  If
-            disabled (the default), the VM directly boots the NixOS
-            kernel and initial ramdisk, bypassing the boot loader
-            altogether.
+            Use a boot loader to boot the system.
+            This allows, among other things, testing the boot loader.
+
+            If disabled, the kernel and initrd are directly booted,
+            forgoing any bootloader.
          '';
      };

@ -1026,7 +1022,6 @@ in
        "-netdev user,id=user.0,${forwardingOptions}${restrictNetworkOption}\"$QEMU_NET_OPTS\""
      ];

-    # FIXME: Consolidate this one day.
    virtualisation.qemu.options = mkMerge [
      (mkIf cfg.qemu.virtioKeyboard [
        "-device virtio-keyboard"
@ -1078,14 +1073,12 @@ in
      }) cfg.emptyDiskImages)
    ];

+    # Use mkVMOverride to enable building test VMs (e.g. via `nixos-rebuild
+    # build-vm`) of a system configuration, where the regular value for the
+    # `fileSystems' attribute should be disregarded (since those filesystems
+    # don't necessarily exist in the VM).
    fileSystems = mkVMOverride cfg.fileSystems;

-    # Mount the host filesystem via 9P, and bind-mount the Nix store
-    # of the host into our own filesystem.  We use mkVMOverride to
-    # allow this module to be applied to "normal" NixOS system
-    # configuration, where the regular value for the `fileSystems'
-    # attribute should be disregarded for the purpose of building a VM
-    # test image (since those filesystems don't exist in the VM).
    virtualisation.fileSystems = let
      mkSharedDir = tag: share:
        {
--- a/nixos/tests/aaaaxy.nix
+++ b/nixos/tests/aaaaxy.nix
@ -21,7 +21,7 @@
      "ln -s '${pkgs.aaaaxy.testing_infra}/assets/demos/benchmark.dem' '/tmp/aaaaxy/assets/demos/'",
      """
        '${pkgs.aaaaxy.testing_infra}/scripts/regression-test-demo.sh' \
-        'aaaaxy' 'on track for Any%, All Paths and No Teleports' \
+        'aaaaxy' 'on track for Any%, All Paths, No Teleports and No Coil' \
        '${pkgs.aaaaxy}/bin/aaaaxy' '/tmp/aaaaxy/assets/demos/benchmark.dem'
      """,
    )
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@ -614,6 +614,7 @@ in {
  postfix-raise-smtpd-tls-security-level = handleTest ./postfix-raise-smtpd-tls-security-level.nix {};
  postfixadmin = handleTest ./postfixadmin.nix {};
  postgis = handleTest ./postgis.nix {};
+  apache_datasketches = handleTest ./apache_datasketches.nix {};
  postgresql = handleTest ./postgresql.nix {};
  postgresql-jit = handleTest ./postgresql-jit.nix {};
  postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {};
--- a/nixos/tests/apache_datasketches.nix
+++ b/nixos/tests/apache_datasketches.nix
@ -0,0 +1,29 @@
+import ./make-test-python.nix ({ pkgs, ...} : {
+  name = "postgis";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [ lsix ]; # TODO: Who's the maintener now?
+  };
+
+  nodes = {
+    master =
+      { pkgs, ... }:
+
+      {
+        services.postgresql = let mypg = pkgs.postgresql_15; in {
+            enable = true;
+            package = mypg;
+            extraPlugins = with mypg.pkgs; [
+              apache_datasketches
+            ];
+        };
+      };
+  };
+
+  testScript = ''
+    start_all()
+    master.wait_for_unit("postgresql")
+    master.sleep(10)  # Hopefully this is long enough!!
+    master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION datasketches;'")
+    master.succeed("sudo -u postgres psql -c 'SELECT hll_sketch_to_string(hll_sketch_build(1));'")
+  '';
+})
--- a/nixos/tests/cinnamon.nix
+++ b/nixos/tests/cinnamon.nix
@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {

  meta.maintainers = lib.teams.cinnamon.members;

-  nodes.machine = { nodes, ... }: {
+  nodes.machine = { ... }: {
    imports = [ ./common/user-account.nix ];
    services.xserver.enable = true;
    services.xserver.desktopManager.cinnamon.enable = true;
@ -13,7 +13,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {

  testScript = { nodes, ... }:
    let
-      user = nodes.machine.config.users.users.alice;
+      user = nodes.machine.users.users.alice;
      uid = toString user.uid;
      bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus";
      display = "DISPLAY=:0.0";
--- a/nixos/tests/ntfy-sh.nix
+++ b/nixos/tests/ntfy-sh.nix
@ -3,6 +3,7 @@ import ./make-test-python.nix {

  nodes.machine = { ... }: {
    services.ntfy-sh.enable = true;
+    services.ntfy-sh.settings.base-url = "http://localhost:2586";
  };

  testScript = ''
@ -12,12 +13,14 @@ import ./make-test-python.nix {

    machine.wait_for_unit("multi-user.target")

-    machine.wait_for_open_port(80)
+    machine.wait_for_open_port(2586)

-    machine.succeed(f"curl -d '{msg}' localhost:80/test")
+    machine.succeed(f"curl -d '{msg}' localhost:2586/test")

-    notif = json.loads(machine.succeed("curl -s localhost:80/test/json?poll=1"))
+    notif = json.loads(machine.succeed("curl -s localhost:2586/test/json?poll=1"))

    assert msg == notif["message"], "Wrong message"
+
+    machine.succeed("ntfy user list")
  '';
 }
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@ -386,7 +386,7 @@ let
    '';

    meta = with pkgs.lib.maintainers; {
-      maintainers = [ aszlig cdepillabout ];
+      maintainers = [ aszlig ];
    };
  };

--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@ -93,6 +93,21 @@ let
      };
    });

+    buildDataSpell = { pname, version, src, license, description, wmClass, ... }:
+      (mkJetBrainsProduct {
+        inherit pname version src wmClass jdk;
+        product = "DataSpell";
+        meta = with lib; {
+          homepage = "https://www.jetbrains.com/dataspell/";
+          inherit description license platforms;
+          longDescription = ''
+            DataSpell is a new IDE from JetBrains built for Data Scientists.
+            Mainly it integrates Jupyter notebooks in the IntelliJ platform.
+          '';
+          maintainers = with maintainers; [ leona ];
+        };
+      });
+
  buildGateway = { pname, version, src, license, description, wmClass, product, ... }:
    (mkJetBrainsProduct {
      inherit pname version src wmClass jdk product;
@ -320,6 +335,19 @@ in
    update-channel = products.datagrip.update-channel;
  };

+  dataspell = buildDataSpell rec {
+    pname = "dataspell";
+    version = products.dataspell.version;
+    description = "The IDE for Professional Data Scientists";
+    license = lib.licenses.unfree;
+    src = fetchurl {
+      url = products.dataspell.url;
+      sha256 = products.dataspell.sha256;
+    };
+    wmClass = "jetbrains-dataspell";
+    update-channel = products.dataspell.update-channel;
+  };
+
  gateway = buildGateway rec {
    pname = "gateway";
    product = "JetBrains Gateway";
--- a/pkgs/applications/editors/jetbrains/update.py
+++ b/pkgs/applications/editors/jetbrains/update.py
@ -64,7 +64,7 @@ def update_product(name, product):
            build = latest_build(channel)
            new_version = build["@version"]
            new_build_number = build["@fullNumber"]
-            if all(x not in channel["@name"] for x in ["EAP", "Gateway"]):
+            if "EAP" not in channel["@name"]:
                version_or_build_number = new_version
            else:
                version_or_build_number = new_build_number
--- a/pkgs/applications/editors/jetbrains/versions.json
+++ b/pkgs/applications/editors/jetbrains/versions.json
@ -16,13 +16,21 @@
      "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.2.tar.gz",
      "build_number": "231.9011.35"
    },
+    "dataspell": {
+      "update-channel": "DataSpell RELEASE",
+      "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz",
+      "version": "2023.1",
+      "sha256": "12856b7571ff789a427361cfcb4cb1743e7f3af77f611ceda57aafe847328865",
+      "url": "https://download.jetbrains.com/python/dataspell-2023.1.tar.gz",
+      "build_number": "231.8109.197"
+    },
    "gateway": {
      "update-channel": "Gateway RELEASE",
      "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
-      "version": "2023.1.1",
-      "sha256": "217196806daebd14e604d13247862e44e6a0b0b9f115f1b9ceadbcfb064b3c3c",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.1.tar.gz",
-      "build_number": "231.8770.69"
+      "version": "2023.1.2",
+      "sha256": "fab46521e7a4558a166e3b11d86ca2312a9807e69419925ed5743ab4f421ab96",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.2.tar.gz",
+      "build_number": "231.9011.34"
    },
    "goland": {
      "update-channel": "GoLand RELEASE",
@ -123,13 +131,21 @@
      "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.2.dmg",
      "build_number": "231.9011.35"
    },
+    "dataspell": {
+      "update-channel": "DataSpell RELEASE",
+      "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg",
+      "version": "2023.1",
+      "sha256": "dc118f466b6e5fa3e6c449f25977d5d1fc6746c004a000464802c535a1bdaa90",
+      "url": "https://download.jetbrains.com/python/dataspell-2023.1.dmg",
+      "build_number": "231.8109.197"
+    },
    "gateway": {
      "update-channel": "Gateway RELEASE",
      "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
-      "version": "2023.1.1",
-      "sha256": "e580bf5bd657b721677fec0250ce582adb1cf92daa1ac065b56fc2d8148fac97",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.1.dmg",
-      "build_number": "231.8770.69"
+      "version": "2023.1.2",
+      "sha256": "320beadb9eb50f48eb431bcd2c88ec1c2e7e0ef2f1f2414aa3842de5930d79ff",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.2.dmg",
+      "build_number": "231.9011.34"
    },
    "goland": {
      "update-channel": "GoLand RELEASE",
@ -230,13 +246,21 @@
      "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.2-aarch64.dmg",
      "build_number": "231.9011.35"
    },
+    "dataspell": {
+      "update-channel": "DataSpell RELEASE",
+      "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg",
+      "version": "2023.1",
+      "sha256": "7b5b4388303bf7d381597995e3f4d5684c0f60a4e5ad5a4481ab4e451be6e2cf",
+      "url": "https://download.jetbrains.com/python/dataspell-2023.1-aarch64.dmg",
+      "build_number": "231.8109.197"
+    },
    "gateway": {
      "update-channel": "Gateway RELEASE",
      "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg",
-      "version": "2023.1.1",
-      "sha256": "ab0c773315a6d8abcaae75440f7fc122a7e80237eddaa3487c3222a52a95497f",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.1-aarch64.dmg",
-      "build_number": "231.8770.69"
+      "version": "2023.1.2",
+      "sha256": "338edd281715b14193834ed01947c6161865e58d1416557316c2b298401a0272",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.2-aarch64.dmg",
+      "build_number": "231.9011.34"
    },
    "goland": {
      "update-channel": "GoLand RELEASE",
--- a/pkgs/applications/editors/tecoc/default.nix
+++ b/pkgs/applications/editors/tecoc/default.nix
@ -2,17 +2,18 @@
 , lib
 , fetchFromGitHub
 , ncurses
+, unstableGitUpdater
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "tecoc";
-  version = "unstable-2020-11-03";
+  version = "unstable-2023-04-21";

  src = fetchFromGitHub {
    owner = "blakemcbride";
    repo = "TECOC";
-    rev = "79fcb6cfd6c5f9759f6ec46aeaf86d5806b13a0b";
-    sha256 = "sha256-JooLvoh9CxLHLOXXxE7zA7R9yglr9BGUwX4nrw2/vIw=";
+    rev = "021d1d15242b9d6c84d70c9ffcf1871793898f0a";
+    hash = "sha256-VGIO+uiAZkdzLYmJztmnKTS4HDIVow4AimaneHj7E1M=";
  };

  buildInputs = [ ncurses ];
@ -27,29 +28,34 @@ stdenv.mkDerivation rec {
             then "makefile.win"
             else "makefile.linux"; # I think Linux is a safe default...

-  makeFlags = [ "CC=${stdenv.cc}/bin/cc" "-C src/" ];
-
-  preInstall = ''
-    install -d $out/bin $out/share/doc/${pname}-${version} $out/lib/teco/macros
-  '';
+  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "-C src/" ];

  installPhase = ''
    runHook preInstall
+
+    install -d $out/bin $out/share/doc/tecoc $out/lib/teco/macros
    install -m755 src/tecoc $out/bin
-    install -m644 src/aaout.txt doc/* $out/share/doc/${pname}-${version}
+    install -m644 src/aaout.txt doc/* $out/share/doc/tecoc
    install -m644 lib/* lib2/* $out/lib/teco/macros
+
    runHook postInstall
  '';

-  postInstall = ''
-    (cd $out/bin
-     ln -s tecoc Make
-     ln -s tecoc mung
-     ln -s tecoc teco
-     ln -s tecoc Inspect )
+  postFixup = ''
+    pushd $out/bin
+    ln -s tecoc Make
+    ln -s tecoc mung
+    ln -s tecoc teco
+    ln -s tecoc Inspect
+    popd
  '';

-  meta = with lib; {
+  passthru.updateScript = unstableGitUpdater {
+    url = finalAttrs.meta.homepage;
+  };
+
+  meta = {
+    homepage = "https://github.com/blakemcbride/TECOC";
    description = "A clone of the good old TECO editor";
    longDescription = ''
      For those who don't know: TECO is the acronym of Tape Editor and COrrector
@ -65,11 +71,10 @@ stdenv.mkDerivation rec {

      TECOC is a portable C implementation of TECO-11.
    '';
-    homepage = "https://github.com/blakemcbride/TECOC";
    license = {
      url = "https://github.com/blakemcbride/TECOC/tree/master/doc/readme-1st.txt";
    };
-    maintainers = [ maintainers.AndersonTorres ];
-    platforms = platforms.unix;
+    maintainers = [ lib.maintainers.AndersonTorres ];
+    platforms = lib.platforms.unix;
  };
-}
+})
--- a/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock
+++ b/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock
@ -749,9 +749,9 @@ dependencies = [

 [[package]]
 name = "h2"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d"
+checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f"
 dependencies = [
 "bytes",
 "fnv",
@ -1086,7 +1086,7 @@ dependencies = [

 [[package]]
 name = "maple"
-version = "0.1.43"
+version = "0.1.44"
 dependencies = [
 "built",
 "chrono",
--- a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix
+++ b/pkgs/applications/editors/vim/plugins/vim-clap/default.nix
@ -7,16 +7,17 @@
 , stdenv
 , darwin
 , vimUtils
+, nix-update-script
 }:

 let
-  version = "0.43";
+  version = "0.44";

  src = fetchFromGitHub {
    owner = "liuchengxu";
    repo = "vim-clap";
    rev = "v${version}";
-    hash = "sha256-UHsDSah8Fn67w11s/lwL76qbGPqXhz6tYlBBuiqTNXs=";
+    hash = "sha256-3kPRntl5tHsITrEJaRRcidowcyMpXDTVV5jFN/GV8Sk=";
  };

  meta = with lib; {
@ -62,5 +63,8 @@ vimUtils.buildVimPluginFrom2Nix {

  passthru = {
    inherit maple;
+    updateScript = nix-update-script {
+      attrPath = "vimPlugins.vim-clap.maple";
+    };
  };
 }
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -305,6 +305,23 @@ let
        };
      };

+      asdine.cue = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "cue";
+          publisher = "asdine";
+          version = "0.3.2";
+          sha256 = "sha256-jMXqhgjRdM3UG/9NtiwWAg61mBW8OYVAKDWgb4hzhA4=";
+        };
+        meta = {
+          description = "Cue language support for Visual Studio Code";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=asdine.cue";
+          homepage = "https://github.com/asdine/vscode-cue";
+          changelog = "https://marketplace.visualstudio.com/items/asdine.cue/changelog";
+          license = lib.licenses.mit;
+          maintainers = [lib.maintainers.matthewpi];
+        };
+      };
+
      astro-build.astro-vscode = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "astro-vscode";
@ -599,18 +616,51 @@ let
        };
      };

-      catppuccin.catppuccin-vsc = buildVscodeMarketplaceExtension {
+      catppuccin = {
+        catppuccin-vsc = buildVscodeMarketplaceExtension {
+          mktplcRef = {
+            name = "catppuccin-vsc";
+            publisher = "catppuccin";
+            version = "2.6.1";
+            sha256 = "sha256-B56b7PeuVnkxEqvd4vL9TYO7s8fuA+LOCTbJQD9e7wY=";
+          };
+          meta = {
+            description = "Soothing pastel theme for VSCode";
+            license = lib.licenses.mit;
+            downloadPage = "https://marketplace.visualstudio.com/items?itemName=Catppuccin.catppuccin-vsc";
+            maintainers = [ lib.maintainers.nullx76 ];
+          };
+        };
+        catppuccin-vsc-icons = buildVscodeMarketplaceExtension {
+          mktplcRef = {
+            name = "catppuccin-vsc-icons";
+            publisher = "catppuccin";
+            version = "0.12.0";
+            sha256 = "sha256-i47tY6DSVtV8Yf6AgZ6njqfhaUFGEpgbRcBF70l2Xe0=";
+          };
+          meta = {
+            description = "Soothing pastel icon theme for VSCode";
+            license = lib.licenses.mit;
+            downloadPage = "https://marketplace.visualstudio.com/items?itemName=Catppuccin.catppuccin-vsc-icons";
+            maintainers = [ lib.maintainers.laurent-f1z1 ];
+          };
+        };
+      };
+
+      charliermarsh.ruff = buildVscodeMarketplaceExtension {
        mktplcRef = {
-          name = "catppuccin-vsc";
-          publisher = "catppuccin";
-          version = "2.6.1";
-          sha256 = "sha256-B56b7PeuVnkxEqvd4vL9TYO7s8fuA+LOCTbJQD9e7wY=";
+          name = "ruff";
+          publisher = "charliermarsh";
+          version = "2023.16.0";
+          sha256 = "sha256-MCRfG2CmGXLX15Qv/cxuH8VE1lJLPs4tXlCNnFqm5lc=";
        };
        meta = {
-          description = "Soothing pastel theme for VSCode";
          license = lib.licenses.mit;
-          downloadPage = "https://marketplace.visualstudio.com/items?itemName=Catppuccin.catppuccin-vsc";
-          maintainers = [ lib.maintainers.nullx76 ];
+          changelog = "https://github.com/charliermarsh/ruff-vscode/releases";
+          description = "Ruff extension for Visual Studio Code";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff";
+          homepage = "https://github.com/charliermarsh/ruff-vscode/";
+          maintainers = [ lib.maintainers.azd325 ];
        };
      };

@ -1435,6 +1485,22 @@ let
        };
      };

+      github.copilot-chat = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          publisher = "github";
+          name = "copilot-chat";
+          version = "0.1.2023060101";
+          sha256 = "sha256-g3UIcy2TpD3m8EamxneUXYAV/bbCPvPhOWdcuXPkK9g=";
+        };
+        meta = {
+          description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.copilot-chat";
+          homepage = "https://github.com/features/copilot";
+          license = lib.licenses.unfree;
+          maintainers = [ lib.maintainers.laurent-f1z1 ];
+        };
+      };
+
      github.github-vscode-theme = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "github-vscode-theme";
@ -1720,6 +1786,22 @@ let
        };
      };

+      janet-lang.vscode-janet = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vscode-janet";
+          publisher = "janet-lang";
+          version = "0.0.2";
+          sha256 = "sha256-oj0e++z2BtadIXOnTlocIIHliYweZ1iyrV08DwatfLI=";
+        };
+        meta = {
+          description = "Janet language support for Visual Studio Code";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=janet-lang.vscode-janet";
+          homepage = "https://github.com/janet-lang/vscode-janet";
+          license = lib.licenses.mit;
+          maintainers = [ lib.maintainers.wackbyte ];
+        };
+      };
+
      jdinhlife.gruvbox = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "gruvbox";
@ -2757,6 +2839,22 @@ let
        };
      };

+      seatonjiang.gitmoji-vscode = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          publisher = "seatonjiang";
+          name = "gitmoji-vscode";
+          version = "1.2.2";
+          sha256 = "sha256-+lwbCLV62y1IHrjCygBphQZJUu+ZApYTwBQld5uu12w=";
+        };
+        meta = {
+          description = "Gitmoji tool for git commit messages in VSCode";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=seatonjiang.gitmoji-vscode";
+          homepage = "https://github.com/seatonjiang/gitmoji-vscode/";
+          license = lib.licenses.mit;
+          maintainers = [ lib.maintainers.laurent-f1z1 ];
+        };
+      };
+
      serayuzgur.crates = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "crates";
--- a/pkgs/applications/file-managers/browsr/default.nix
+++ b/pkgs/applications/file-managers/browsr/default.nix
@ -0,0 +1,85 @@
+{ lib
+, python3
+, fetchFromGitHub
+, extras ? [ "all" ]
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "browsr";
+  version = "1.10.7";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "juftin";
+    repo = "browsr";
+    rev = "v${version}";
+    hash = "sha256-AT5cFQ4CldlHv3MQYAGXdZVB3bNAAvbJeosdxZjcPBM=";
+  };
+
+  nativeBuildInputs = with python3.pkgs; [
+    hatchling
+    pythonRelaxDepsHook
+    pytestCheckHook
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    art
+    click
+    fsspec
+    pandas
+    pillow
+    pymupdf
+    rich
+    rich-click
+    rich-pixels
+    textual
+    universal-pathlib
+  ] ++ lib.attrVals extras passthru.optional-dependencies;
+
+  passthru.optional-dependencies = with python3.pkgs; {
+    all = [
+      adlfs
+      aiohttp
+      gcsfs
+      paramiko
+      pyarrow
+      requests
+      s3fs
+    ];
+    parquet = [
+      pyarrow
+    ];
+    remote = [
+      adlfs
+      aiohttp
+      gcsfs
+      paramiko
+      requests
+      s3fs
+    ];
+  };
+
+  pythonRelaxDeps = [
+    "fsspec"
+    "pymupdf"
+    "rich-click"
+    "textual"
+  ];
+
+  pythonImportsCheck = [ "browsr" ];
+
+  # requires internet access
+  disabledTests = [
+    "test_github_screenshot"
+    "test_github_screenshot_license"
+    "test_textual_app_context_path_github"
+  ];
+
+  meta = with lib; {
+    description = "A file explorer in your terminal";
+    homepage = "https://github.com/juftin/browsr";
+    changelog = "https://github.com/fsspec/universal_pathlib/releases/tag/${src.rev}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@ -47,13 +47,13 @@ in

 stdenv.mkDerivation (finalAttrs: {
  pname = "imagemagick";
-  version = "7.1.1-10";
+  version = "7.1.1-11";

  src = fetchFromGitHub {
    owner = "ImageMagick";
    repo = "ImageMagick";
    rev = finalAttrs.version;
-    hash = "sha256-W7s/j4R4C22hYVhye8TjDYHtDq/1Q4GGu/9lxyjk6sA=";
+    hash = "sha256-/CZRnNy/p87sEcH94RkRYgYXexFSU0Bm809pcvDFdV4=";
  };

  outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
--- a/pkgs/applications/graphics/halftone/default.nix
+++ b/pkgs/applications/graphics/halftone/default.nix
@ -0,0 +1,61 @@
+{ lib
+, fetchFromGitHub
+, wrapGAppsHook4
+, meson
+, ninja
+, pkg-config
+, appstream-glib
+, desktop-file-utils
+, gobject-introspection
+, glib
+, blueprint-compiler
+, libadwaita
+, python3Packages
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "halftone";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "tfuxu";
+    repo = pname;
+    rev = version;
+    hash = "sha256-EYxnGpVKPV3Xg6dH3m1aC3/pDigUxkNF7C8U16n8al8=";
+  };
+
+  format = "other";
+  dontWrapGApps = true;
+
+  nativeBuildInputs = [
+    appstream-glib
+    blueprint-compiler
+    desktop-file-utils
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+    glib
+    gobject-introspection
+  ];
+
+  buildInputs = [
+    libadwaita
+  ];
+
+  propagatedBuildInputs = with python3Packages; [
+    pygobject3
+    wand
+  ];
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/tfuxu/halftone";
+    description = "Simple app for giving images that pixel-art style";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ foo-dogsquared ];
+  };
+}
--- a/pkgs/applications/misc/dasel/default.nix
+++ b/pkgs/applications/misc/dasel/default.nix
@ -5,13 +5,13 @@

 buildGoModule rec {
  pname = "dasel";
-  version = "2.3.3";
+  version = "2.3.4";

  src = fetchFromGitHub {
    owner = "TomWright";
    repo = "dasel";
    rev = "v${version}";
-    sha256 = "sha256-RP5088h+KDKENaSf/I8pzFBrHx1cxPKtQRqyNm0CjuQ=";
+    sha256 = "sha256-/1CTtRTLgMlmFeubq3ebGnA9Do1mW6TtAXsCwi1JFmk=";
  };

  vendorHash = "sha256-cLf0MzEAykmtnPjT2vGOSPwIXJP6BhxheUaicT7o/X4=";
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "hugo";
-  version = "0.112.6";
+  version = "0.112.7";

  src = fetchFromGitHub {
    owner = "gohugoio";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-FrZwblAxXtGduCZc37269iygflft32G0ICrJLd9ssBU=";
+    hash = "sha256-8vvIMCnxS/1MsooSmNPeHE9VxYYOVyKiExr8oSgcYF4=";
  };

  vendorHash = "sha256-ZPgGR1NPVn/LF/nvCXP4S08MYvWp3Dtq/I9kom9HP9c=";
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@ -4,7 +4,6 @@
 , lib
 , fetchFromGitHub
 , python3
-, fetchPypi
 , substituteAll
 , nix-update-script
 , nixosTests
@ -17,43 +16,6 @@ let
    self = py;
    packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) (
      [
-        (
-          # with version 3 of flask-limiter octoprint 1.8.7 fails to start with
-          #  TypeError: Limiter.__init__() got multiple values for argument 'key_func'
-          self: super: {
-            flask-limiter = super.flask-limiter.overridePythonAttrs (oldAttrs: rec {
-              version = "2.6.2";
-              src = fetchFromGitHub {
-                owner = "alisaifee";
-                repo = "flask-limiter";
-                rev = version;
-                sha256 = "sha256-eWOdJ7m3cY08ASN/X+7ILJK99iLJJwCY8294fwJiDew=";
-              };
-            });
-            flask-babel = super.flask-babel.overridePythonAttrs (oldAttrs: rec {
-              version = "2.0.0";
-              src = fetchPypi {
-                pname = "Flask-Babel";
-                inherit version;
-                sha256 = "sha256-+fr0XNsuGjLqLsFEA1h9QpUQjzUBenghorGsuM/ZJX0=";
-              };
-              nativeBuildInputs = [ ];
-              format = "setuptools";
-              outputs = [ "out" ];
-              patches = [ ];
-            });
-            # downgrade needed for flask-babel 2.0.0
-            babel = super.babel.overridePythonAttrs (oldAttrs: rec {
-              version = "2.11.0";
-              src = fetchPypi {
-                pname = "Babel";
-                inherit version;
-                hash = "sha256-XvSzImsBgN7d7UIpZRyLDho6aig31FoHMnLzE+TPl/Y=";
-              };
-              propagatedBuildInputs = [ self.pytz ];
-            });
-          }
-        )
        # Built-in dependency
        (
          self: super: {
@ -94,14 +56,14 @@ let
          self: super: {
            octoprint-pisupport = self.buildPythonPackage rec {
              pname = "OctoPrint-PiSupport";
-              version = "2022.6.13";
+              version = "2023.5.24";
              format = "setuptools";

              src = fetchFromGitHub {
                owner = "OctoPrint";
                repo = "OctoPrint-PiSupport";
                rev = version;
-                hash = "sha256-3z5Btl287W3j+L+MQG8FOWt21smML0vpmu9BP48B9A0=";
+                hash = "sha256-KfkZXJ2f02G2ee+J1w+YQRKz+LSWwxVIIwmdevDGhew=";
              };

              # requires octoprint itself during tests
@ -118,13 +80,13 @@ let
          self: super: {
            octoprint = self.buildPythonPackage rec {
              pname = "OctoPrint";
-              version = "1.8.7";
+              version = "1.9.0";

              src = fetchFromGitHub {
                owner = "OctoPrint";
                repo = "OctoPrint";
                rev = version;
-                hash = "sha256-g4PYB9YbkX0almRPgMFlb8D633Y5fc3H+Boa541suqc=";
+                hash = "sha256-gTWQSqgksZMxdaZ7V3hmnqXlZ+OMI86RX0lC8z1AEzI=";
              };

              propagatedBuildInputs = with self; [
@ -176,6 +138,8 @@ let
                wrapt
                zeroconf
                zipstream-ng
+                class-doc
+                pydantic
              ] ++ lib.optionals stdenv.isDarwin [
                py.pkgs.appdirs
              ];
@ -217,6 +181,7 @@ let
                    "werkzeug"
                    "flask"
                    "Flask-Limiter"
+                    "blinker"
                  ];
                in
                ''
--- a/pkgs/applications/misc/octoprint/ffmpeg-path.patch
+++ b/pkgs/applications/misc/octoprint/ffmpeg-path.patch
@ -1,30 +1,11 @@
-diff --git a/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2 b/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2
-index 79342dcd7..6165a4119 100644
--- a/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2
-+++ b/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2
-@@ -29,14 +29,3 @@
-     {% include "snippets/settings/webcam/webcamStreamUrl.jinja2" %}
-     {% include "snippets/settings/webcam/webcamSnapshotUrl.jinja2" %}
- </form>
-
-<h4>{{ _('Timelapse Recordings') }}</h4>
-
-{% trans %}<p>
-    To render the snapshots into timelapse recordings, OctoPrint also needs to
-    know the correct <strong>path to FFMPEG</strong>.
-</p>{% endtrans %}
-
-<form class="form-horizontal" data-bind="with: settingsViewModel" onsubmit="return false;">
-    {% include "snippets/settings/webcam/ffmpegPath.jinja2" %}
-</form>
 diff --git a/src/octoprint/server/api/settings.py b/src/octoprint/server/api/settings.py
 index c3e6cea10..ced2f8fa0 100644
 --- a/src/octoprint/server/api/settings.py
 +++ b/src/octoprint/server/api/settings.py
-@@ -130,7 +130,7 @@ def getSettings():
-             "snapshotUrl": s.get(["webcam", "snapshot"]),
+@@ -130,7 +130,7 @@ data["webcam"] = {
+             "webcamEnabled": s.getBoolean(["webcam", "webcamEnabled"]),
             "snapshotTimeout": s.getInt(["webcam", "snapshotTimeout"]),
-             "snapshotSslValidation": s.getBoolean(["webcam", "snapshotSslValidation"]),
+             "timelapseEnabled": s.getBoolean(["webcam", "timelapseEnabled"]),
 -            "ffmpegPath": s.get(["webcam", "ffmpeg"]),
 +            "ffmpegPath": "@ffmpeg@",
             "ffmpegCommandline": s.get(["webcam", "ffmpegCommandline"]),
--- a/pkgs/applications/misc/p2pool/default.nix
+++ b/pkgs/applications/misc/p2pool/default.nix
@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "p2pool";
-  version = "3.3";
+  version = "3.4";

  src = fetchFromGitHub {
    owner = "SChernykh";
    repo = "p2pool";
    rev = "v${version}";
-    sha256 = "sha256-sCG2Dr0gDznOyuSCVm/Zop+64elUZLt+XSDff2jQlwg=";
+    sha256 = "sha256-JtBl+ZNqBbCl8gFZy+q5PP2qoRKULA++leGsyrT3DaQ=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/misc/please-cli/default.nix
+++ b/pkgs/applications/misc/please-cli/default.nix
@ -0,0 +1,45 @@
+{ lib
+, curl
+, fetchFromGitHub
+, jq
+, makeBinaryWrapper
+, please-cli
+, stdenv
+, testers
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "please-cli";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner = "TNG";
+    repo = "please-cli";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-rJIR4eMhXL4K9iO7JxnkgWNsICV3hPQb0aobWNuHAG0=";
+  };
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm555 please.sh "$out/bin/please"
+    wrapProgram $out/bin/please \
+      --prefix PATH : ${lib.makeBinPath [ curl jq ]}
+    runHook postInstall
+  '';
+
+  passthru.tests = testers.testVersion {
+    package = please-cli;
+    version = "v${finalAttrs.version}";
+  };
+
+  meta = with lib; {
+    description = "An AI helper script to create CLI commands based on GPT prompts";
+    homepage = "https://github.com/TNG/please-cli";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ _8-bit-fox ];
+    mainProgram = "please";
+    platforms = platforms.all;
+  };
+})
--- a/pkgs/applications/misc/pot/Cargo.lock
+++ b/pkgs/applications/misc/pot/Cargo.lock
--- a/pkgs/applications/misc/pot/default.nix
+++ b/pkgs/applications/misc/pot/default.nix
@ -0,0 +1,139 @@
+{ lib
+, stdenv
+, stdenvNoCC
+, rustPlatform
+, fetchFromGitHub
+, wrapGAppsHook
+, cargo
+, rustc
+, cargo-tauri
+, pkg-config
+, nodePackages
+, esbuild
+, buildGoModule
+, jq
+, moreutils
+, libayatana-appindicator
+, gtk3
+, webkitgtk
+, libsoup
+, openssl
+, xdotool
+}:
+
+stdenv.mkDerivation rec {
+  pname = "pot";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "pot-app";
+    repo = "pot-desktop";
+    rev = version;
+    hash = "sha256-sAAdw7gYUQTHZYmxSAk2LByR+iMT836sQolk2NOgWD0=";
+  };
+
+  sourceRoot = "source/src-tauri";
+
+  postPatch = ''
+    substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
+      --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
+
+    chmod -R +w ..
+    # Disable auto update check by default
+    sed -i -e '/auto_check/s/true/false/' src/main.rs ../src/windows/Config/index.jsx
+  '';
+
+  pnpm-deps = stdenvNoCC.mkDerivation {
+    pname = "${pname}-pnpm-deps";
+    inherit src version;
+
+    nativeBuildInputs = [
+      jq
+      moreutils
+      nodePackages.pnpm
+    ];
+
+    installPhase = ''
+      export HOME=$(mktemp -d)
+      pnpm config set store-dir $out
+      # use --ignore-script and --no-optional to avoid downloading binaries
+      # use --frozen-lockfile to avoid checking git deps
+      pnpm install --frozen-lockfile --no-optional --ignore-script
+
+      # Remove timestamp and sort the json files
+      rm -rf $out/v3/tmp
+      for f in $(find $out -name "*.json"); do
+        sed -i -E -e 's/"checkedAt":[0-9]+,//g' $f
+        jq --sort-keys . $f | sponge $f
+      done
+    '';
+
+    dontFixup = true;
+    outputHashMode = "recursive";
+    outputHash = "sha256-lqGskG1MWbZKEmqJf4b9dGltmFHw/qOo/Sh7JIFS4IQ=";
+  };
+
+  cargoDeps = rustPlatform.importCargoLock {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "tauri-plugin-single-instance-0.0.0" = "sha256-M6uGcf4UWAU+494wAK/r2ta1c3IZ07iaURLwJJR9F3U=";
+      "tauri-plugin-autostart-0.0.0" = "sha256-M6uGcf4UWAU+494wAK/r2ta1c3IZ07iaURLwJJR9F3U=";
+      "enigo-0.1.2" = "sha256-99VJ0WYD8jV6CYUZ1bpYJBwIE2iwOZ9SjOvyA2On12Q=";
+    };
+  };
+
+  nativeBuildInputs = [
+    rustPlatform.cargoSetupHook
+    cargo
+    rustc
+    cargo-tauri
+    wrapGAppsHook
+    nodePackages.pnpm
+    pkg-config
+  ];
+
+  buildInputs = [
+    gtk3
+    libsoup
+    libayatana-appindicator
+    openssl
+    webkitgtk
+    xdotool
+  ];
+
+  ESBUILD_BINARY_PATH = "${lib.getExe (esbuild.override {
+    buildGoModule = args: buildGoModule (args // rec {
+      version = "0.17.15";
+      src = fetchFromGitHub {
+        owner = "evanw";
+        repo = "esbuild";
+        rev = "v${version}";
+        hash = "sha256-AzkjVw3o+yP/l6jiMmgzaymb0el2/OcAl8WQYbuMprw=";
+      };
+      vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
+    });
+  })}";
+
+  preBuild = ''
+    export HOME=$(mktemp -d)
+    pnpm config set store-dir ${pnpm-deps}
+    pnpm install --offline --frozen-lockfile --no-optional --ignore-script
+    chmod -R +w ../node_modules
+    pnpm rebuild
+    # Use cargo-tauri from nixpkgs instead of pnpm tauri from npm
+    cargo tauri build -b deb
+  '';
+
+  preInstall = ''
+    mv target/release/bundle/deb/*/data/usr/ $out
+  '';
+
+  meta = with lib; {
+    description = "A cross-platform translation software";
+    homepage = "https://pot.pylogmon.com";
+    platforms = platforms.linux;
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ linsui ];
+  };
+}
+
--- a/pkgs/applications/misc/ticker/default.nix
+++ b/pkgs/applications/misc/ticker/default.nix
@ -5,13 +5,13 @@

 buildGoModule rec {
  pname = "ticker";
-  version = "4.5.10";
+  version = "4.5.13";

  src = fetchFromGitHub {
    owner = "achannarasappa";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-2CELRY6V7/6PcC5s4XjOqadxXc5SbS0vstqLEej3xnI=";
+    hash = "sha256-0T4Cl9o21Tt4ZFeY7kUe4Obu4IY9JMLBwUqgs4rZx1U=";
  };

  vendorHash = "sha256-c7wU9LLRlS9kOhE4yAiKAs/npQe8lvSwPcd+/D8o9rk=";
--- a/pkgs/applications/networking/cluster/k0sctl/default.nix
+++ b/pkgs/applications/networking/cluster/k0sctl/default.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "k0sctl";
-  version = "0.15.0";
+  version = "0.15.1";

  src = fetchFromGitHub {
    owner = "k0sproject";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-i/XgEPuYNxn10eOXfF+X33oLlkO9r6daeygZcSdcicQ=";
+    sha256 = "sha256-80AmGc3SdniKayvviVoItrj8v+3m1sAJXSjoRJzw7mE=";
  };

-  vendorSha256 = "sha256-RTC2AEDzSafvJT/vuPjzs25PhuzBiPb32an/a/wpY04=";
+  vendorSha256 = "sha256-K4/sIHWVe1Wj8LJgrqfoOg1hHXvH3HEgU5vq82tzMSk=";

  ldflags = [
    "-s"
--- a/pkgs/applications/networking/cluster/k8sgpt/default.nix
+++ b/pkgs/applications/networking/cluster/k8sgpt/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "k8sgpt";
-  version = "0.3.5";
+  version = "0.3.6";

  src = fetchFromGitHub {
    owner = "k8sgpt-ai";
    repo = "k8sgpt";
    rev = "v${version}";
-    hash = "sha256-AUUcC9S1+83ZlOH/LEG+QXstxpr8949JbqFMF9hIiVE=";
+    hash = "sha256-GAEAl59bzCffsh0XYa61R/AwwoGyFfG0M1m1U2aQiis=";
  };

-  vendorHash = "sha256-tXLt18ryxO9Q7E/MJWDlZy1gmxnMauqfcbmRdF9uUt8=";
+  vendorHash = "sha256-g0Lgu0aC25+/MYoRKMqTN8Iu8j/KA4G1DBjbhOfPpjg=";

  CGO_ENABLED = 0;

--- a/pkgs/applications/networking/cluster/kubectl-images/default.nix
+++ b/pkgs/applications/networking/cluster/kubectl-images/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "kubectl-images";
-  version = "0.5.2";
+  version = "0.6.1";

  src = fetchFromGitHub {
    owner = "chenjiandongx";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-aDWtLTnMQklTU6X6LF0oBuh1317I5/kiEZVePgJjIdU";
+    sha256 = "sha256-Zs9ok5jDhNeEw+dbER0cpLYn41uXwHNx0w0t1A3CSlI=";
  };

-  vendorSha256 = "sha256-FxaOOFwDf3LNREOlA7frqhDXzc91LC3uJev3kzLDEy8";
+  vendorHash = "sha256-8zV2iZ10H5X6fkRqElfc7lOf3FhmDzR2lb3Jgyhjyio=";

  postInstall = ''
    mv $out/bin/cmd $out/bin/kubectl-images
--- a/pkgs/applications/networking/cluster/kyverno/default.nix
+++ b/pkgs/applications/networking/cluster/kyverno/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "kyverno";
-  version = "1.9.5";
+  version = "1.10.0";

  src = fetchFromGitHub {
    owner = "kyverno";
    repo = "kyverno";
    rev = "v${version}";
-    sha256 = "sha256-e/CZ5XiJFvj/HVSBPTyLybu5ZZNVte3Bf/qGhEK7k80=";
+    sha256 = "sha256-Phiswg3ouIVkk1hsO0Hm5mFdcpZb403ypETrKKHOyTw=";
  };

  ldflags = [
@ -18,7 +18,7 @@ buildGoModule rec {
    "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00"
  ];

-  vendorHash = "sha256-5eHLnzbjqbF8meHMfSo6NuK+SdokRkyPwoedunU2ECs=";
+  vendorHash = "sha256-AjfWxRwAWLX/TF1bI6Q7AUcfYhMHBgDNtKQsZSrBMn4=";

  subPackages = [ "cmd/cli/kubectl-kyverno" ];

--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -28,20 +28,20 @@
    "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
  },
  "aiven": {
-    "hash": "sha256-adBkV3Gg75M0336GDzzxN3ONt24/KBKPC2EDDFRB7JY=",
+    "hash": "sha256-kHCgl4osr0L9GR9Fv3u8dUs+ko82vxjE6dmJ9QZoQsE=",
    "homepage": "https://registry.terraform.io/providers/aiven/aiven",
    "owner": "aiven",
    "repo": "terraform-provider-aiven",
-    "rev": "v4.4.0",
+    "rev": "v4.4.1",
    "spdx": "MIT",
-    "vendorHash": "sha256-5m2ZZ/tuLz8zTt8B1TiokDZeQ9qJYeaVEhqMU04zV2s="
+    "vendorHash": "sha256-phcV7ZQ/7umtJMp0ozGV0jpYizlvmNq3Eo/wZ7tfNec="
  },
  "akamai": {
-    "hash": "sha256-IbftoN1fnnl6Z4SkW2DsPvlaNTSLc+oskJBnAM2afpg=",
+    "hash": "sha256-RIJarmJZHDl5XhXLnr1igiBq9Uu9/2N+vhosPFTs2tg=",
    "homepage": "https://registry.terraform.io/providers/akamai/akamai",
    "owner": "akamai",
    "repo": "terraform-provider-akamai",
-    "rev": "v4.0.0",
+    "rev": "v4.1.0",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-Z7HlUJ5VuQ7rBhoprmvS6HwNZ53iUoBnfXzKTV43bzE="
  },
@ -110,13 +110,13 @@
    "vendorHash": null
  },
  "aws": {
-    "hash": "sha256-eHU3dsu/aJ72BTwe4CAWhf29ZueUhyg10Ncs9yUxi80=",
+    "hash": "sha256-DbBS2gEUqG3YjGfLIj3YvQUCTyp+nRH7d4htTUkUNHQ=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/aws",
    "owner": "hashicorp",
    "repo": "terraform-provider-aws",
-    "rev": "v5.0.1",
+    "rev": "v5.1.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-53BHSeRBgnT5LuSuTUA5R/bbeozd2gOxsXd/2tlrbYU="
+    "vendorHash": "sha256-0LH3zYIdqgxpKtxQBEuTxRivHf0yvmwUTUo+vAAmdaY="
  },
  "azuread": {
    "hash": "sha256-wBNS2a6O1QJgssbAWhSRSfxaVZ35zgT/qNdpE++NQ8U=",
@ -128,11 +128,11 @@
    "vendorHash": null
  },
  "azurerm": {
-    "hash": "sha256-GVxIr57y5tlOrZYtu09FI0IYG2cLkHkYMMofdqdCans=",
+    "hash": "sha256-Zyv4il6co+TcMkN+Hl7znGT1uN5Xohe8zFv5ghkeZP8=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
    "owner": "hashicorp",
    "repo": "terraform-provider-azurerm",
-    "rev": "v3.58.0",
+    "rev": "v3.59.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@ -390,13 +390,13 @@
    "vendorHash": null
  },
  "flexibleengine": {
-    "hash": "sha256-TZR/zXgecHUbaD9Yb83HvBwWauDtHDsnEcSZYFmY5y4=",
+    "hash": "sha256-WO99FOJ6zZ0GPxoYwH55Ul0HTktH2UZ3yWRrwjk3qA4=",
    "homepage": "https://registry.terraform.io/providers/FlexibleEngineCloud/flexibleengine",
    "owner": "FlexibleEngineCloud",
    "repo": "terraform-provider-flexibleengine",
-    "rev": "v1.37.0",
+    "rev": "v1.38.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-HcyUGKbgj322fU7keN/lBEn6UJhV3QXScBJHZHJkCII="
+    "vendorHash": "sha256-DSdE0CkAIJje71/S64no9fMJMUhAnFiK3lWewvcyE14="
  },
  "fortios": {
    "deleteVendor": true,
@ -419,11 +419,11 @@
    "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk="
  },
  "github": {
-    "hash": "sha256-f/9Dn5jsh+aWpfmSeICQQUOuD9A6A4/1pMb+Q19HDLI=",
+    "hash": "sha256-DEylIY8bU0obeeAUYwNx1f5mZwQpmhILdp+940P9z78=",
    "homepage": "https://registry.terraform.io/providers/integrations/github",
    "owner": "integrations",
    "repo": "terraform-provider-github",
-    "rev": "v5.25.1",
+    "rev": "v5.26.0",
    "spdx": "MIT",
    "vendorHash": null
  },
@ -493,13 +493,13 @@
    "vendorHash": "sha256-qa6DUmzL+JB/WTJM+a5VDvBCsrbt8gq/LeqzdAHLm0Q="
  },
  "helm": {
-    "hash": "sha256-X9keFjAmV86F/8ktxiv/VrnkHOazP9e/aOC9aRw1A48=",
+    "hash": "sha256-1yoFtTuB8GI2eazW85isgKYOcyL2codoXvTE0VCu5ZI=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/helm",
    "owner": "hashicorp",
    "repo": "terraform-provider-helm",
-    "rev": "v2.9.0",
+    "rev": "v2.10.0",
    "spdx": "MPL-2.0",
-    "vendorHash": null
+    "vendorHash": "sha256-a80+gjjoFOKI96pUMvTMyM90F5oCb1Ime8hPQcFedFE="
  },
  "heroku": {
    "hash": "sha256-xxNFI36UYhCsz/mqcRkG+XEIlAyw4RCLuwrz02rdJqY=",
@ -855,13 +855,13 @@
    "vendorHash": "sha256-62q67aaOZA3fQmyL8bEHB+W497bcx9Xy7kKrbkjkbaI="
  },
  "opentelekomcloud": {
-    "hash": "sha256-8Is/KtVE9eoOAk7GTsqkBe1Ppw0YpThBnj0uxQlBMuY=",
+    "hash": "sha256-35Xp3FfkBvdacbZ20+Z8DgwavA5XvqJknEzLM71YkXg=",
    "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
    "owner": "opentelekomcloud",
    "repo": "terraform-provider-opentelekomcloud",
-    "rev": "v1.34.4",
+    "rev": "v1.35.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-2EuGZxHrpPwDicSrIf/Jx/c4LhOtE5HvTz9LkJ4xCSY="
+    "vendorHash": "sha256-ubEoh4GUkyNAvyHCowURhvucOyFpMidxoFeqE1w2GQY="
  },
  "opsgenie": {
    "hash": "sha256-fcQChRIwxAeAdYPTYC9rPSdbrmXaBIOotF7vQhO9Sl0=",
@ -1044,13 +1044,13 @@
    "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
  },
  "spotinst": {
-    "hash": "sha256-VzIQqxEZl3+cRk19vxJGF0DbzutrfOWeP27TMat//Es=",
+    "hash": "sha256-gaQN06gJIsJVRmURzs7cWQEX7bM0LCMJfzR10PslFh4=",
    "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
    "owner": "spotinst",
    "repo": "terraform-provider-spotinst",
-    "rev": "v1.120.0",
+    "rev": "v1.121.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-/sXd/qAChMpVTY/JN45fb2XFG0nsqc1ytC2FjXpva3c="
+    "vendorHash": "sha256-hfg3XyBf5V+NJTzCoHbnTU4HkEdQsllqcH2NjeTmlf0="
  },
  "stackpath": {
    "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=",
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
@ -123,6 +123,10 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
    mimeTypes = [ "x-scheme-handler/element" ];
  };

+  postFixup = lib.optionalString stdenv.isDarwin ''
+    cp build/icon.icns $out/Applications/Element.app/Contents/Resources/element.icns
+  '';
+
  passthru = {
    updateScript = ./update.sh;

--- a/pkgs/applications/office/morgen/default.nix
+++ b/pkgs/applications/office/morgen/default.nix
@ -3,11 +3,11 @@

 stdenv.mkDerivation rec {
  pname = "morgen";
-  version = "2.7.0";
+  version = "2.7.2";

  src = fetchurl {
    url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb";
-    sha256 = "sha256-v01mytnyJA1GQ/9/+7/HDIbwW1Jl4dpgf+84k0sRf4o=";
+    sha256 = "sha256-s3gGDBxT0kHEuWiE79P/CKMknTljIdxzAP4GkS+hk+g=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/radio/abracadabra/default.nix
+++ b/pkgs/applications/radio/abracadabra/default.nix
@ -0,0 +1,50 @@
+{ lib, stdenv, fetchFromGitHub, cmake, wrapQtAppsHook
+, qtbase, qtmultimedia, qttools
+, faad2, mpg123, portaudio
+, libusb1, rtl-sdr, airspy, soapysdr-with-plugins
+} :
+
+stdenv.mkDerivation rec {
+  pname = "abracadabra";
+  version = "2.1.1";
+
+  src = fetchFromGitHub {
+    owner = "KejPi";
+    repo = "AbracaDABra";
+    rev = "v${version}";
+    sha256 = "sha256-pjcao8KTEmgE54dUBxLLnStszR32LryfciMKScBOGdc=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    wrapQtAppsHook
+    qttools
+  ];
+
+  buildInputs = [
+    qtbase
+    qtmultimedia
+    faad2
+    mpg123
+    portaudio
+    libusb1
+    rtl-sdr
+    airspy
+    soapysdr-with-plugins
+  ];
+
+  cmakeFlags = [
+    "-DAIRSPY=ON"
+    "-DSOAPYSDR=ON"
+  ];
+
+  meta = with lib; {
+    description = "DAB/DAB+ radio application";
+    homepage = "https://github.com/KejPi/AbracaDABra";
+    platforms = platforms.linux;
+    license = licenses.mit;
+    maintainers = [ maintainers.markuskowa ];
+    mainProgram = "AbracaDABra";
+  };
+}
+
--- a/pkgs/applications/radio/flamp/default.nix
+++ b/pkgs/applications/radio/flamp/default.nix
@ -0,0 +1,41 @@
+{ lib
+, stdenv
+, fetchgit
+, autoreconfHook
+, pkg-config
+, fltk13
+, libsndfile
+, gettext
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "flamp";
+  version = "2.2.07";
+
+  src = fetchgit {
+    url = "https://git.code.sf.net/p/fldigi/flamp";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-BnKL1iwaw1iJC5qcGCvdMr461n0BSYxk61dbAnhpz2c=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    gettext
+  ];
+
+  buildInputs = [
+    fltk13
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    description = "Digital modem program";
+    homepage = "https://sourceforge.net/projects/fldigi/";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ stteague ];
+    platforms = platforms.unix;
+    broken = stdenv.system == "x86_64-darwin";
+  };
+})
--- a/pkgs/applications/radio/sdrangel/default.nix
+++ b/pkgs/applications/radio/sdrangel/default.nix
@ -50,13 +50,13 @@

 stdenv.mkDerivation rec {
  pname = "sdrangel";
-  version = "7.14.1";
+  version = "7.14.2";

  src = fetchFromGitHub {
    owner = "f4exb";
    repo = "sdrangel";
    rev = "v${version}";
-    hash = "sha256-AsKjsoIyGjGpRGA+pYQsO4x2C5Rb7xaG+Q0cS3xANcM=";
+    hash = "sha256-A9/uOecV1qRbAGcKI1brPFsbjfJG/8/zKrMwKMGw9rE=";
  };

  nativeBuildInputs = [ cmake ninja pkg-config wrapQtAppsHook ];
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@ -26,14 +26,14 @@

 stdenv.mkDerivation rec {
  pname = "boinc";
-  version = "7.22.1";
+  version = "7.22.2";

  src = fetchFromGitHub {
    name = "${pname}-${version}-src";
    owner = "BOINC";
    repo = "boinc";
    rev = "client_release/${lib.versions.majorMinor version}/${version}";
-    hash = "sha256-DYbcWBJEjSJWRXNdumDhhybKSs8ofyREWqj2ghrvmBE=";
+    hash = "sha256-9GgvyYiDfppRuDFfxn50e+YZeSX0SLKSfo31lWx2FBs=";
  };

  nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ];
--- a/pkgs/applications/terminal-emulators/kitty/themes.nix
+++ b/pkgs/applications/terminal-emulators/kitty/themes.nix
@ -5,13 +5,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "kitty-themes";
-  version = "unstable-2023-03-08";
+  version = "unstable-2023-06-01";

  src = fetchFromGitHub {
    owner = "kovidgoyal";
    repo = "kitty-themes";
-    rev = "c01fcbd694353507c3cc7f657179bad1f32140a7";
-    hash = "sha256-heJayOz/2Bey/zAwL2PR1OsfGyCPqMyxT1XzwHLhQ0w=";
+    rev = "f765eb1715d79c6cb3ad3d571342d612f21b810e";
+    hash = "sha256-Y3N8cyqEsY/kB2xMIlPYnbuYUs8grzepPx/11maG4bo=";
  };

  dontConfigure = true;
--- a/pkgs/applications/terminal-emulators/roxterm/default.nix
+++ b/pkgs/applications/terminal-emulators/roxterm/default.nix
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
      Tabbed, VTE-based terminal emulator. Similar to gnome-terminal without
      the dependencies on Gnome.
    '';
-    maintainers = with maintainers; [ cdepillabout ];
+    maintainers = with maintainers; [ ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/version-management/dvc/default.nix
+++ b/pkgs/applications/version-management/dvc/default.nix
@ -10,14 +10,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "dvc";
-  version = "2.58.1";
+  version = "2.58.2";
  format = "pyproject";

  src = fetchFromGitHub {
    owner = "iterative";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-n6tX7sHzyeIWnpFM08QosQ7y27SB9OKMuQeSB25lJRU=";
+    hash = "sha256-sq5jrGtUVe8R4ZdjwEBW9yEYBe8o1xyFVZGcZ+tMvCs=";
  };

  pythonRelaxDeps = [
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@ -15,13 +15,13 @@
 , withJson ? true
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "fossil";
-  version = "2.21";
+  version = "2.22";

  src = fetchurl {
-    url = "https://www.fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz";
-    hash = "sha256-wf7sp4ISTN52mSQHxw8s7//L4beLZtwkaJDYMVnvgIQ=";
+    url = "https://www.fossil-scm.org/home/tarball/version-${finalAttrs.version}/fossil-${finalAttrs.version}.tar.gz";
+    hash = "sha256-gdgj/29dF1s4TfqE7roNBS2nOjfNZs1yt4bnFnEhDWs=";
  };

  # required for build time tool `./tools/translate.c`
@ -67,4 +67,4 @@ stdenv.mkDerivation rec {
    maintainers = with maintainers; [ maggesi viric ];
    platforms = platforms.all;
  };
-}
+})
--- a/pkgs/applications/version-management/ghorg/default.nix
+++ b/pkgs/applications/version-management/ghorg/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "ghorg";
-  version = "1.9.4";
+  version = "1.9.5";

  src = fetchFromGitHub {
    owner = "gabrie30";
    repo = "ghorg";
    rev = "v${version}";
-    sha256 = "sha256-J/oZrtm/Bs4SU/Wl9LEH0kMxkOEXR2g/Bod5QFoCudU=";
+    sha256 = "sha256-beFZRH5FG6aEvMhjsheeBHxqHRH0jkRt5FDYkeyrc2E=";
  };

  doCheck = false;
--- a/pkgs/applications/version-management/git-credential-oauth/default.nix
+++ b/pkgs/applications/version-management/git-credential-oauth/default.nix
@ -0,0 +1,29 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "git-credential-oauth";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "hickford";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-f12PgTtfs/S9RI8+QFROkNqccRWeIW1/YkynqvKJc7I=";
+  };
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=${version}"
+  ];
+
+  vendorHash = "sha256-9X7ti3NR5MKK0MpiyTOTO+EtdMuu4/TW/diHq9FjSHY=";
+
+  meta = {
+    description = "Git credential helper that securely authenticates to GitHub, GitLab and BitBucket using OAuth";
+    homepage = "https://github.com/hickford/git-credential-oauth";
+    changelog = "https://github.com/hickford/git-credential-oauth/releases/tag/${src.rev}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ shyim ];
+  };
+}
--- a/pkgs/applications/version-management/gitsign/default.nix
+++ b/pkgs/applications/version-management/gitsign/default.nix
@ -2,15 +2,15 @@

 buildGoModule rec {
  pname = "gitsign";
-  version = "0.6.0";
+  version = "0.7.1";

  src = fetchFromGitHub {
    owner = "sigstore";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-VgkTFYnHKpqZOack5SabOFu2BRespVRhgrsepo0V1mI=";
+    hash = "sha256-99JpuABkPHTNy9OpvRL7aIe1ZTrs2uZvxtxZf8346Ao=";
  };
-  vendorHash = "sha256-zalysp+90+QM5hX7yUudJW61h+3tQOab7ZpcF5kZSB0=";
+  vendorHash = "sha256-+EKC/Up48EjwfVhLTpoxctWCSMDL0kLZaRPLBl0JGFQ=";

  subPackages = [
    "."
--- a/pkgs/applications/virtualization/pods/Cargo.lock
+++ b/pkgs/applications/virtualization/pods/Cargo.lock
@ -29,6 +29,12 @@ dependencies = [
 "memchr",
 ]

+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@ -83,7 +89,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 ]

 [[package]]
@ -94,7 +100,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 ]

 [[package]]
@ -221,13 +227,13 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "chrono"
-version = "0.4.24"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
 dependencies = [
+ "android-tzdata",
 "iana-time-zone",
 "js-sys",
- "num-integer",
 "num-traits",
 "serde",
 "time 0.1.45",
@ -249,8 +255,7 @@ dependencies = [
 [[package]]
 name = "containers-api"
 version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef94b0ff8338282b35bafb408eb0a3e53ba05bdb3b36840589ab9a67a6682593"
+source = "git+https://github.com/vv9k/containers-api#00efa72b05225df04f030284cd924cd9688a37a0"
 dependencies = [
 "chrono",
 "flate2",
@ -366,7 +371,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 ]

 [[package]]
@ -517,7 +522,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 ]

 [[package]]
@ -1244,12 +1249,9 @@ dependencies = [

 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
+checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"

 [[package]]
 name = "malloc_buf"
@ -1307,14 +1309,13 @@ dependencies = [

 [[package]]
 name = "mio"
-version = "0.8.6"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
 dependencies = [
 "libc",
- "log",
 "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
 ]

 [[package]]
@ -1483,9 +1484,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.17.1"
+version = "1.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b"

 [[package]]
 name = "oo7"
@ -1615,7 +1616,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 ]

 [[package]]
@ -1639,7 +1640,7 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 [[package]]
 name = "podman-api"
 version = "0.10.0"
-source = "git+https://github.com/vv9k/podman-api-rs.git#363d945b9b9905c50dfa0bfe0f9331f9fdeef079"
+source = "git+https://github.com/vv9k/podman-api-rs.git#92dd1200bc627709a290c094c4887638077c6d50"
 dependencies = [
 "base64",
 "byteorder",
@ -1672,7 +1673,7 @@ dependencies = [

 [[package]]
 name = "pods"
-version = "1.2.1"
+version = "1.2.2"
 dependencies = [
 "anyhow",
 "ashpd",
@ -1740,18 +1741,18 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.58"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8"
+checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
 dependencies = [
 "unicode-ident",
 ]

 [[package]]
 name = "quote"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
 dependencies = [
 "proc-macro2",
 ]
@ -1884,7 +1885,7 @@ checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 ]

 [[package]]
@ -1906,7 +1907,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 ]

 [[package]]
@ -2032,9 +2033,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.16"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"
+checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
 dependencies = [
 "proc-macro2",
 "quote",
@ -2120,7 +2121,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 ]

 [[package]]
@ -2180,9 +2181,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.28.1"
+version = "1.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105"
+checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
 dependencies = [
 "autocfg",
 "bytes 1.4.0",
@ -2281,7 +2282,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 ]

 [[package]]
@ -2461,7 +2462,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 "wasm-bindgen-shared",
 ]

@ -2483,7 +2484,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@ -2762,7 +2763,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 ]

 [[package]]
--- a/pkgs/applications/virtualization/pods/default.nix
+++ b/pkgs/applications/virtualization/pods/default.nix
@ -19,19 +19,20 @@

 stdenv.mkDerivation rec {
  pname = "pods";
-  version = "1.2.1";
+  version = "1.2.2";

  src = fetchFromGitHub {
    owner = "marhkb";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-xi9PmgSINW64vl1skQFjkTqnC6Dfty9eVFVFmMy9K9E=";
+    sha256 = "sha256-9gSLjnBExxLhbrsD2nYPwoUCmc2gE+afblQOcnWPap0=";
  };

  cargoDeps = rustPlatform.importCargoLock {
    lockFile = ./Cargo.lock;
    outputHashes = {
-      "podman-api-0.10.0" = "sha256-zZUQdBbzIfClS2EDSkOTlR1e0R9lYbbgsICZeo6Yalc=";
+      "containers-api-0.8.0" = "sha256-jttd4n45OcsWWBu7nAL0Ny0ILjsAKtAIQN+Vkv34gdM=";
+      "podman-api-0.10.0" = "sha256-P3a/OgH26EFWJjYkEob4Cg90U5cR/fBF0LcFlosJlcU=";
    };
  };

--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@ -1,5 +1,5 @@
 { config, stdenv, fetchurl, lib, acpica-tools, dev86, pam, libxslt, libxml2, wrapQtAppsHook
-, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL
+, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL2, libcap, libGL, libGLU
 , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras
 , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43
 , alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib
@ -24,14 +24,14 @@ let
  buildType = "release";
  # Use maintainers/scripts/update.nix to update the version and all related hashes or
  # change the hashes in extpack.nix and guest-additions/default.nix as well manually.
-  version = "7.0.6";
+  version = "7.0.8";
 in stdenv.mkDerivation {
  pname = "virtualbox";
  inherit version;

  src = fetchurl {
-    url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "f146d9a86a35af0abb010e628636fd800cb476cc2ce82f95b0c0ca876e1756ff";
+    url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}a.tar.bz2";
+    sha256 = "7de37359518d467b7f888235175cd388f66e9f16bd9359dd6265fbc95933c1e6";
  };

  outputs = [ "out" "modsrc" ];
@ -45,12 +45,12 @@ in stdenv.mkDerivation {
  buildInputs = [
    acpica-tools dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL
    libcap glib lvm2 alsa-lib curl libvpx pam makeself perl
-    libXmu libpng libopus python3 ]
+    libXmu libXrandr libpng libopus python3 ]
    ++ optional javaBindings jdk
    ++ optional pythonBindings python3 # Python is needed even when not building bindings
    ++ optional pulseSupport libpulseaudio
-    ++ optionals headless [ libXrandr libGL ]
-    ++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL ]
+    ++ optionals headless [ libGL ]
+    ++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL2 libGLU ]
    ++ optionals enableWebService [ gsoap zlib ];

  hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ];
@ -82,6 +82,8 @@ in stdenv.mkDerivation {

  patches =
     optional enableHardening ./hardened.patch
+     # Since VirtualBox 7.0.8, VBoxSDL requires SDL2, but the build framework uses SDL1
+  ++ optional (!headless) ./fix-sdl.patch
  ++ [ ./extra_symbols.patch ]
     # When hardening is enabled, we cannot use wrapQtApp to ensure that VirtualBoxVM sees
     # the correct environment variables needed for Qt to work, specifically QT_PLUGIN_PATH.
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@ -12,14 +12,14 @@ fetchurl rec {
    # Manually sha256sum the extensionPack file, must be hex!
    # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
    # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
-    let value = "292961aa8723b54f96f89f6d8abf7d8e29259d94b7de831dbffb9ae15d346434";
+    let value = "452320f3b1da42b30c32ea5ab5887983b575638ceb4e3beacfefbbb3b0510a48";
    in assert (builtins.stringLength value) == 64; value;

  meta = {
    description = "Oracle Extension pack for VirtualBox";
    license = licenses.virtualbox-puel;
    homepage = "https://www.virtualbox.org/";
-    maintainers = with maintainers; [ sander cdepillabout ];
+    maintainers = with maintainers; [ sander ];
    platforms = [ "x86_64-linux" ];
  };
 }
--- a/pkgs/applications/virtualization/virtualbox/fix-sdl.patch
+++ b/pkgs/applications/virtualization/virtualbox/fix-sdl.patch
@ -0,0 +1,72 @@
+diff --git a/configure b/configure
+index 5edefba..a17e8c5 100755
+--- a/configure
+++ b/configure
+@@ -1184,10 +1184,10 @@ check_sdl()
+       fail
+     fi
+   else
+-    if which_wrapper sdl-config > /dev/null; then
+-      FLGSDL=`sdl-config --cflags`
+    if which_wrapper sdl2-config > /dev/null; then
+      FLGSDL=`sdl2-config --cflags`
+       INCSDL=`strip_I "$FLGSDL"`
+-      LIBSDL=`sdl-config --libs`
+      LIBSDL=`sdl2-config --libs`
+       LIBSDLMAIN="-lSDLmain"
+       FLDSDL=
+       foundsdl=1
+diff --git a/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp b/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp
+index 16dc282..4889865 100644
+--- a/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp
+++ b/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp
+@@ -56,7 +56,7 @@ using namespace com;
+ #  pragma warning(push)
+ #  pragma warning(disable: 4121) /* warning C4121: 'SDL_SysWMmsg' : alignment of a member was sensitive to packing*/
+ # endif
+-# include <SDL_syswm.h>           /* for SDL_GetWMInfo() */
+# include <SDL2/SDL_syswm.h>           /* for SDL_GetWMInfo() */
+ # ifdef _MSC_VER
+ #  pragma warning(pop)
+ # endif
+diff --git a/src/VBox/Frontends/VBoxSDL/Makefile.kmk b/src/VBox/Frontends/VBoxSDL/Makefile.kmk
+index da43153..2aa8cd7 100644
+--- a/src/VBox/Frontends/VBoxSDL/Makefile.kmk
+++ b/src/VBox/Frontends/VBoxSDL/Makefile.kmk
+@@ -79,10 +79,6 @@ if !defined(VBOX_WITH_HARDENING) || "$(KBUILD_TARGET)" != "darwin" # No hardened
+   VBoxSDL_INCS += \
+   	$(VBOX_XCURSOR_INCS)
+  endif
+- ifn1of ($(KBUILD_TARGET), solaris) # Probably wrong with SDL2
+-  VBoxSDL_LIBS = \
+-  	$(LIB_SDK_LIBSDL2_SDLMAIN)
+- endif
+  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
+   VBoxSDL_LIBS += \
+   	$(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL) \
+diff --git a/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp b/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
+index 065c391..22788e1 100644
+--- a/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
+++ b/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
+@@ -64,7 +64,7 @@ using namespace com;
+ # pragma warning(disable: 4121) /* warning C4121: 'SDL_SysWMmsg' : alignment of a member was sensitive to packing*/
+ #endif
+ #ifndef RT_OS_DARWIN
+-# include <SDL_syswm.h>          /* for SDL_GetWMInfo() */
+# include <SDL2/SDL_syswm.h>          /* for SDL_GetWMInfo() */
+ #endif
+ #ifdef _MSC_VER
+ # pragma warning(pop)
+diff --git a/src/VBox/Frontends/VBoxSDL/VBoxSDL.h b/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
+index dde548f..8fc9fb3 100644
+--- a/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
+++ b/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
+@@ -45,7 +45,7 @@
+ # pragma warning(disable: 4121) /* warning C4121: 'SDL_SysWMmsg' : alignment of a member was sensitive to packing*/
+ # pragma warning(disable: 4668) /* warning C4668: '__GNUC__' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
+ #endif
+-#include <SDL.h>
+#include <SDL2/SDL.h>
+ #ifdef _MSC_VER
+ # pragma warning(pop)
+ #endif
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {

  src = fetchurl {
    url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "21e0f407d2a4f5c286084a70718aa20235ea75969eca0cab6cfab43a3499a010";
+    sha256 = "8d73e2361afbf696e6128ffa5e96d9f6a78ff32cb2cb54c727a5be7992be0b31";
  };

  KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
--- a/pkgs/applications/virtualization/virtualbox/hardened.patch
+++ b/pkgs/applications/virtualization/virtualbox/hardened.patch
@ -1,8 +1,8 @@
 diff --git a/include/iprt/mangling.h b/include/iprt/mangling.h
-index 25b918d1..1420ff1d 100644
+index 991dd9e..defc781 100644
 --- a/include/iprt/mangling.h
 +++ b/include/iprt/mangling.h
-@@ -1695,6 +1695,7 @@
+@@ -1802,6 +1802,7 @@
 # define RTPathStripSuffix                              RT_MANGLER(RTPathStripSuffix)
 # define RTPathStripFilename                            RT_MANGLER(RTPathStripFilename)
 # define RTPathStripTrailingSlash                       RT_MANGLER(RTPathStripTrailingSlash)
@ -10,7 +10,7 @@ index 25b918d1..1420ff1d 100644
 # define RTPathTemp                                     RT_MANGLER(RTPathTemp)
 # define RTPathTraverseList                             RT_MANGLER(RTPathTraverseList)
 # define RTPathUnlink                                   RT_MANGLER(RTPathUnlink)
-@@ -1734,6 +1735,7 @@
+@@ -1842,6 +1843,7 @@
 # define RTProcGetAffinityMask                          RT_MANGLER(RTProcGetAffinityMask)
 # define RTProcGetExecutablePath                        RT_MANGLER(RTProcGetExecutablePath)
 # define RTProcGetPriority                              RT_MANGLER(RTProcGetPriority)
@ -19,10 +19,10 @@ index 25b918d1..1420ff1d 100644
 # define RTProcQueryParent                              RT_MANGLER(RTProcQueryParent)
 # define RTProcQueryUsername                            RT_MANGLER(RTProcQueryUsername)
 diff --git a/include/iprt/path.h b/include/iprt/path.h
-index 99060e35..ccfbeb76 100644
+index 89bf8f6..5caa578 100644
 --- a/include/iprt/path.h
 +++ b/include/iprt/path.h
-@@ -1221,6 +1221,15 @@ RTDECL(int) RTPathCalcRelative(char *pszPathDst, size_t cbPathDst, const char *p
+@@ -1235,6 +1235,15 @@ RTDECL(int) RTPathCalcRelative(char *pszPathDst, size_t cbPathDst, const char *p
  */
 RTDECL(int) RTPathExecDir(char *pszPath, size_t cchPath);
 
@ -39,10 +39,10 @@ index 99060e35..ccfbeb76 100644
  * Gets the user home directory.
  *
 diff --git a/include/iprt/process.h b/include/iprt/process.h
-index f4f67dd4..ab882a19 100644
+index 4ca981e..058ae7a 100644
 --- a/include/iprt/process.h
 +++ b/include/iprt/process.h
-@@ -352,6 +352,16 @@ RTR3DECL(const char *) RTProcExecutablePath(void);
+@@ -384,6 +384,16 @@ RTR3DECL(const char *) RTProcExecutablePath(void);
  */
 RTR3DECL(char *) RTProcGetExecutablePath(char *pszExecPath, size_t cbExecPath);
 
@ -60,10 +60,10 @@ index f4f67dd4..ab882a19 100644
  * Daemonize the current process, making it a background process.
  *
 diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp
-index 75ff8572..18a077b7 100644
+index e78a397..ff5b541 100644
 --- a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp
 +++ b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp
-@@ -1531,9 +1531,9 @@ static int supR3HardenedVerifyFsObject(PCSUPR3HARDENEDFSOBJSTATE pFsObjState, bo
+@@ -1541,9 +1541,9 @@ static int supR3HardenedVerifyFsObject(PCSUPR3HARDENEDFSOBJSTATE pFsObjState, bo
         bool fBad = !fRelaxed || pFsObjState->Stat.st_gid != 2 /*bin*/ || suplibHardenedStrCmp(pszPath, "/usr/lib/iconv");
 # else
         NOREF(fRelaxed);
@ -76,10 +76,10 @@ index 75ff8572..18a077b7 100644
                                           "An unknown (and thus untrusted) group has write access to '", pszPath,
                                           "' and we therefore cannot trust the directory content or that of any subdirectory");
 diff --git a/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp b/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp
-index 2991d3a7..d042a08b 100644
+index 01d7a9f..e52a291 100644
 --- a/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp
 +++ b/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp
-@@ -90,7 +90,7 @@ int MachineLaunchVMCommonWorker(const Utf8Str &aNameOrId,
+@@ -100,7 +100,7 @@ int MachineLaunchVMCommonWorker(const Utf8Str &aNameOrId,
 
     /* Get the path to the executable directory w/ trailing slash: */
     char szPath[RTPATH_MAX];
@ -89,10 +89,10 @@ index 2991d3a7..d042a08b 100644
     size_t cbBufLeft = RTPathEnsureTrailingSeparator(szPath, sizeof(szPath));
     AssertReturn(cbBufLeft > 0, VERR_FILENAME_TOO_LONG);
 diff --git a/src/VBox/Main/src-server/NetworkServiceRunner.cpp b/src/VBox/Main/src-server/NetworkServiceRunner.cpp
-index 2e57690a..3272c840 100644
+index 773d27f..874ec2d 100644
 --- a/src/VBox/Main/src-server/NetworkServiceRunner.cpp
 +++ b/src/VBox/Main/src-server/NetworkServiceRunner.cpp
-@@ -188,7 +188,7 @@ int NetworkServiceRunner::start(bool aKillProcessOnStop)
+@@ -198,7 +198,7 @@ int NetworkServiceRunner::start(bool aKillProcessOnStop)
      * ASSUME it is relative to the directory that holds VBoxSVC.
      */
     char szExePath[RTPATH_MAX];
@ -102,28 +102,28 @@ index 2e57690a..3272c840 100644
     int vrc = RTPathAppend(szExePath, sizeof(szExePath), m->pszProcName);
     AssertLogRelRCReturn(vrc, vrc);
 diff --git a/src/VBox/Main/src-server/generic/NetIf-generic.cpp b/src/VBox/Main/src-server/generic/NetIf-generic.cpp
-index af155966..3b8e793d 100644
+index 1e2eb61..893344c 100644
 --- a/src/VBox/Main/src-server/generic/NetIf-generic.cpp
 +++ b/src/VBox/Main/src-server/generic/NetIf-generic.cpp
-@@ -48,7 +48,7 @@ static int NetIfAdpCtl(const char * pcszIfName, const char *pszAddr, const char
+@@ -62,7 +62,7 @@ static int NetIfAdpCtl(const char * pcszIfName, const char *pszAddr, const char
     const char *args[] = { NULL, pcszIfName, pszAddr, pszOption, pszMask, NULL };
 
     char szAdpCtl[RTPATH_MAX];
-    int rc = RTPathExecDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME));
-+    int rc = RTPathSuidDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME));
-     if (RT_FAILURE(rc))
+-    int vrc = RTPathExecDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME));
+    int vrc = RTPathSuidDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME));
+     if (RT_FAILURE(vrc))
     {
-         LogRel(("NetIfAdpCtl: failed to get program path, rc=%Rrc.\n", rc));
-@@ -95,7 +95,7 @@ static int NetIfAdpCtl(HostNetworkInterface * pIf, const char *pszAddr, const ch
+         LogRel(("NetIfAdpCtl: failed to get program path, vrc=%Rrc.\n", vrc));
+@@ -109,7 +109,7 @@ static int NetIfAdpCtl(HostNetworkInterface * pIf, const char *pszAddr, const ch
 int NetIfAdpCtlOut(const char * pcszName, const char * pcszCmd, char *pszBuffer, size_t cBufSize)
 {
     char szAdpCtl[RTPATH_MAX];
-    int rc = RTPathExecDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME " ") - strlen(pcszCmd));
-+    int rc = RTPathSuidDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME " ") - strlen(pcszCmd));
-     if (RT_FAILURE(rc))
+-    int vrc = RTPathExecDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME " ") - strlen(pcszCmd));
+    int vrc = RTPathSuidDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME " ") - strlen(pcszCmd));
+     if (RT_FAILURE(vrc))
     {
-         LogRel(("NetIfAdpCtlOut: Failed to get program path, rc=%Rrc\n", rc));
-@@ -210,7 +210,7 @@ int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVirtualBox,
+         LogRel(("NetIfAdpCtlOut: Failed to get program path, vrc=%Rrc\n", vrc));
+@@ -224,7 +224,7 @@ int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVirtualBox,
             progress.queryInterfaceTo(aProgress);
 
             char szAdpCtl[RTPATH_MAX];
@ -133,10 +133,10 @@ index af155966..3b8e793d 100644
             {
                 progress->i_notifyComplete(E_FAIL,
 diff --git a/src/VBox/Runtime/r3/path.cpp b/src/VBox/Runtime/r3/path.cpp
-index 4b1a0ada..7f6dd707 100644
+index bcd8deb..46ecd1e 100644
 --- a/src/VBox/Runtime/r3/path.cpp
 +++ b/src/VBox/Runtime/r3/path.cpp
-@@ -81,6 +81,12 @@ RTDECL(int) RTPathExecDir(char *pszPath, size_t cchPath)
+@@ -91,6 +91,12 @@ RTDECL(int) RTPathExecDir(char *pszPath, size_t cchPath)
 }
 
 
@ -150,10 +150,10 @@ index 4b1a0ada..7f6dd707 100644
 {
 #if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_PRIVATE)
 diff --git a/src/VBox/Runtime/r3/process.cpp b/src/VBox/Runtime/r3/process.cpp
-index 5f7c7a87..59461cfa 100644
+index f9d1ecf..042e599 100644
 --- a/src/VBox/Runtime/r3/process.cpp
 +++ b/src/VBox/Runtime/r3/process.cpp
-@@ -117,6 +117,25 @@ RTR3DECL(const char *) RTProcExecutablePath(void)
+@@ -127,6 +127,25 @@ RTR3DECL(const char *) RTProcExecutablePath(void)
     return g_szrtProcExePath;
 }
 
--- a/pkgs/applications/window-managers/cage/wlroots-0_14.patch
+++ b/pkgs/applications/window-managers/cage/wlroots-0_14.patch
@ -1,36 +0,0 @@
-From 9a4523d47efeafd674d419169fe161e5a3b31cb3 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Thu, 3 Jun 2021 17:53:11 +0000
-Subject: [PATCH 1/3] view: chase swaywm/wlroots@9e58301df7f0
-
-view.c:238:52: error: no member named 'subsurfaces' in 'struct wlr_surface'
-        wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces, parent_link) {
-                                       ~~~~~~~~~~~~~~~~~  ^
-/usr/include/wayland-util.h:443:30: note: expanded from macro 'wl_list_for_each'
-        for (pos = wl_container_of((head)->next, pos, member);  \
-                                    ^~~~
-/usr/include/wayland-util.h:409:32: note: expanded from macro 'wl_container_of'
-        (__typeof__(sample))((char *)(ptr) -                            \
-                                      ^~~
-
-Based on https://github.com/swaywm/sway/commit/3162766eef14
---
- view.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/view.c b/view.c
-index b9ba9c2..3f3b0ed 100644
--- a/view.c
-+++ b/view.c
-@@ -235,7 +235,10 @@ view_map(struct cg_view *view, struct wlr_surface *surface)
- 	view->wlr_surface = surface;
- 
- 	struct wlr_subsurface *subsurface;
-	wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces, parent_link) {
-+	wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces_below, parent_link) {
-+		subsurface_create(view, subsurface);
-+	}
-+	wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces_above, parent_link) {
- 		subsurface_create(view, subsurface);
- 	}
- 
--- a/pkgs/data/fonts/kode-mono/default.nix
+++ b/pkgs/data/fonts/kode-mono/default.nix
@ -0,0 +1,28 @@
+{ lib, stdenvNoCC, fetchzip }:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "kode-mono";
+  version = "1.017";
+
+  src = fetchzip {
+    url = "https://github.com/isaozler/kode-mono/releases/download/${finalAttrs.version}/kode-mono-fonts.zip";
+    hash = "sha256-5bTciBQhWNUokOP3YzAwrvp7jeyiF4JMdJDX+6NXvLU=";
+    stripRoot = false;
+  };
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm644 kode-mono-fonts/fonts/ttf/*.ttf      -t $out/share/fonts/truetype/
+    install -Dm644 kode-mono-fonts/fonts/variable/*.ttf -t $out/share/fonts/truetype/
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A custom-designed typeface explicitly created for the developer community";
+    homepage = "https://kodemono.com/";
+    changelog = "https://github.com/isaozler/kode-mono/blob/main/CHANGELOG.md";
+    license = licenses.ofl;
+    maintainers = [ maintainers.isaozler ];
+    platforms = platforms.all;
+  };
+})
--- a/pkgs/data/misc/v2ray-domain-list-community/default.nix
+++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix
@ -3,14 +3,14 @@
 let
  generator = pkgsBuildBuild.buildGoModule rec {
    pname = "v2ray-domain-list-community";
-    version = "20230517022917";
+    version = "20230601044045";
    src = fetchFromGitHub {
      owner = "v2fly";
      repo = "domain-list-community";
      rev = version;
-      hash = "sha256-oRmVJyDfdJhAdF9nJrJs2SjoUs1pr39/xcCps5d3WyM=";
+      hash = "sha256-AVJinqMaVIxq6Tne1b5N6yuszLQ0sgmAtH+sd+sbInA=";
    };
-    vendorHash = "sha256-zkf2neI1HiPkCrcw+cYoZ2L/OGkM8HPIv5gUqc05Wak=";
+    vendorHash = "sha256-lPOn296ngMCYdXoGNDG9okkLC5ryjKIL+UP98lyaKcg=";
    meta = with lib; {
      description = "community managed domain list";
      homepage = "https://github.com/v2fly/domain-list-community";
--- a/pkgs/data/misc/v2ray-geoip/default.nix
+++ b/pkgs/data/misc/v2ray-geoip/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "v2ray-geoip";
-  version = "202305250042";
+  version = "202306010100";

  src = fetchFromGitHub {
    owner = "v2fly";
    repo = "geoip";
-    rev = "e63c89ce477577a720eda422c6c04ba241a36021";
-    sha256 = "sha256-Jv/QZyoMe/kSz/hdlwhfgQzCJGOH6Oypn6HU1SRPTis=";
+    rev = "d8faa6ba0754c083a89898610942d1d1d978ef7f";
+    sha256 = "sha256-Aumk+YPsxZl3F/DQv6w0rE5f5hduLNYApCKQIvRUSIw=";
  };

  installPhase = ''
--- a/pkgs/desktops/cinnamon/warpinator/default.nix
+++ b/pkgs/desktops/cinnamon/warpinator/default.nix
@ -33,13 +33,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "warpinator";
-  version = "1.6.1";
+  version = "1.6.2";

  src = fetchFromGitHub {
    owner = "linuxmint";
    repo = pname;
    rev = version;
-    hash = "sha256-H8bFSgx3IysHCoKrMZ9gbwRl9forEjY90a/PIC68E6k=";
+    hash = "sha256-crGW1FBfTEiKqx981EzG414we4icyBv/keGtMlr8UFc=";
  };

  nativeBuildInputs = [
@ -77,11 +77,6 @@ stdenv.mkDerivation rec {
      --replace '"/bin/python3"' '"${pythonEnv.interpreter}"' \
      --replace "/bin/bwrap" "${bubblewrap}/bin/bwrap" \
      --replace 'GLib.find_program_in_path("bwrap")' "True"
-
-    # Typo fix that can be removed on next update
-    # https://github.com/linuxmint/warpinator/pull/174
-    substituteInPlace src/remote.py \
-      --replace "receiver.remaining_count" "op.remaining_count"
  '';

  passthru.updateScript = gitUpdater {
--- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
@ -8,6 +8,8 @@
 , python3
 , vala
 , wrapGAppsHook4
+, elementary-gtk-theme
+, elementary-icon-theme
 , granite7
 , gtk4
 , libgee
@ -15,13 +17,13 @@

 stdenv.mkDerivation rec {
  pname = "elementary-calculator";
-  version = "2.0.1";
+  version = "2.0.2";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "calculator";
    rev = version;
-    sha256 = "sha256-7aKJDlpODIysrHtqtD5wfd+dULFpD+LfWsjzg3OAxkY=";
+    sha256 = "sha256-PLdPu43ns03vhBwaGw4BWCLNvcJbhUA+5Gr5b//TqfA=";
  };

  nativeBuildInputs = [
@ -34,6 +36,7 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
+    elementary-icon-theme
    granite7
    gtk4
    libgee
@ -44,6 +47,15 @@ stdenv.mkDerivation rec {
    patchShebangs meson/post_install.py
  '';

+  preFixup = ''
+    gappsWrapperArgs+=(
+      # The GTK theme is hardcoded.
+      --prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share"
+      # The icon theme is hardcoded.
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
+    )
+  '';
+
  passthru = {
    updateScript = nix-update-script { };
  };
--- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
@ -19,13 +19,13 @@

 stdenv.mkDerivation rec {
  pname = "elementary-camera";
-  version = "6.2.1";
+  version = "6.2.2";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "camera";
    rev = version;
-    sha256 = "sha256-ijzEMGXoH0gACem/3JaC/aOIaOQgP7Y7n48NgoDMKBk=";
+    sha256 = "sha256-Sj89TBat2RY2Ms02M0P7gmE9tXYk1yrnPLzDwGyAFZA=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
@ -18,13 +18,13 @@

 stdenv.mkDerivation rec {
  pname = "elementary-music";
-  version = "7.0.1";
+  version = "7.1.0";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "music";
    rev = version;
-    sha256 = "sha256-PttmC1Z3rX2XWCECc320HMs692hSBsxkmnh1Q8a/Mg8=";
+    sha256 = "sha256-L+E5gDtIgVkfmOIhzS7x8vtyMJYqx/UQpYMChrt2Tgo=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
@ -18,13 +18,13 @@

 stdenv.mkDerivation rec {
  pname = "elementary-screenshot";
-  version = "6.0.3";
+  version = "6.0.4";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "screenshot";
    rev = version;
-    sha256 = "sha256-7BrowiMUDcf0raeOEFen2V3nenymgE6Rg5a3RilMQaI=";
+    sha256 = "sha256-xG67a19ySuYc5IXlEkaqhnDpDa2krF2y6PnhJkd/rOg=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
@ -19,13 +19,13 @@

 stdenv.mkDerivation rec {
  pname = "elementary-videos";
-  version = "2.9.0";
+  version = "2.9.1";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "videos";
    rev = version;
-    sha256 = "sha256-QQcuhYe3/ZMqQEFJS72+vr1AzJC9Y7mr5Fa5yFsNYIc=";
+    sha256 = "sha256-G961ndONwHiqdeO26Ulxkg71ByfdFMAV35VFzu4TQ3M=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
@ -21,13 +21,13 @@

 stdenv.mkDerivation rec {
  pname = "switchboard-plug-security-privacy";
-  version = "2.4.1";
+  version = "7.0.0";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = pname;
    rev = version;
-    sha256 = "sha256-k8IQumV8rjV3U4ACm5FxCqzSdwqKBaGAqsv45hsP/7c=";
+    sha256 = "sha256-J3lUyLNyxlleD2jklXB2jMRvLY6WG5iccA2lIaJL3d4=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
@ -15,13 +15,13 @@

 stdenv.mkDerivation rec {
  pname = "elementary-default-settings";
-  version = "7.0.1";
+  version = "7.0.2";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "default-settings";
    rev = version;
-    sha256 = "sha256-RPnERK93GCfWyw1sIW5BitCIo11/t1koV4r1+NF5NdI=";
+    sha256 = "sha256-YFI1UM7CxjYkoIhSg9Fn81Ze6DX7D7p89xibk7ik8bI=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
@ -19,13 +19,13 @@

 stdenv.mkDerivation rec {
  pname = "elementary-capnet-assist";
-  version = "2.4.3";
+  version = "2.4.4";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "capnet-assist";
    rev = version;
-    sha256 = "sha256-06DWkLkVpdSYnKOR8zqA0tvWXYrglBM9R/XEIfIkwQU=";
+    sha256 = "sha256-vnFrGHt/rtrDmXokYRoebVpNLfkZPe5IShRsXCWWsXs=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/compilers/bfc/default.nix
+++ b/pkgs/development/compilers/bfc/default.nix
@ -0,0 +1,42 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, llvmPackages_13
+, libxml2
+, ncurses
+, zlib
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "bfc";
+  version = "unstable-2023-02-02";
+
+  src = fetchFromGitHub {
+    owner = "Wilfred";
+    repo = "bfc";
+    rev = "647379de6ec36b64ba0a098589c8374d0ce32690";
+    hash = "sha256-pPx9S7EnrL6aIvLlrCjGDKNYLhzd6ud1RvN+qCiZGXk=";
+  };
+
+  cargoHash = "sha256-5RPB4biLB2BTmfgOGzvnnQjnGp3cTmJdU1CVTAFRvKE=";
+
+  buildInputs = [
+    libxml2
+    ncurses
+    zlib
+  ];
+
+  env = {
+    LLVM_SYS_130_PREFIX = llvmPackages_13.llvm.dev;
+  };
+
+  # process didn't exit successfully: <...> SIGSEGV
+  doCheck = false;
+
+  meta = with lib; {
+    description = "An industrial-grade brainfuck compiler";
+    homepage = "https://bfc.wilfred.me.uk";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
--- a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix
@ -97,8 +97,6 @@ stdenv.mkDerivation {
    substituteInPlace cmake/builtin-config-ix.cmake \
      --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
  '' + lib.optionalString stdenv.isDarwin ''
-    substituteInPlace cmake/builtin-config-ix.cmake \
-      --replace 'set(ARM64 arm64 arm64e)' 'set(ARM64)'
    substituteInPlace cmake/config-ix.cmake \
      --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
  '' + lib.optionalString (useLLVM) ''
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@ -1,13 +1,13 @@
 { lib, stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper, writeScript }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "clojure";
-  version = "1.11.1.1273";
+  version = "1.11.1.1347";

  src = fetchurl {
    # https://clojure.org/releases/tools
-    url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
-    sha256 = "sha256-X4uvzyS9FIrJvL5gqOe4CTye2OuODzhxmXcOOPDkDOY=";
+    url = "https://download.clojure.org/install/clojure-tools-${finalAttrs.version}.tar.gz";
+    hash = "sha256-1ebAPk64tJt/Cpt3pKfMTN50YABKPflqG055f4Quv+M=";
  };

  nativeBuildInputs = [
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
      install -Dm644 example-deps.edn "$clojure_lib_dir/example-deps.edn"
      install -Dm644 tools.edn "$clojure_lib_dir/tools.edn"
      install -Dm644 exec.jar "$clojure_lib_dir/libexec/exec.jar"
-      install -Dm644 clojure-tools-${version}.jar "$clojure_lib_dir/libexec/clojure-tools-${version}.jar"
+      install -Dm644 clojure-tools-${finalAttrs.version}.jar "$clojure_lib_dir/libexec/clojure-tools-${finalAttrs.version}.jar"

      echo "Installing clojure and clj into $bin_dir"
      substituteInPlace clojure --replace PREFIX $out
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
    CLJ_CONFIG=$TMPDIR CLJ_CACHE=$TMPDIR/.clj_cache $out/bin/clojure \
      -Spath \
      -Sverbose \
-      -Scp $out/libexec/clojure-tools-${version}.jar
+      -Scp $out/libexec/clojure-tools-${finalAttrs.version}.jar
  '';

  passthru.updateScript = writeScript "update-clojure" ''
@ -98,4 +98,4 @@ stdenv.mkDerivation rec {
    maintainers = with maintainers; [ jlesquembre thiagokokada ];
    platforms = platforms.unix;
  };
-}
+})
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "armadillo";
-  version = "12.2.0";
+  version = "12.4.0";

  src = fetchurl {
    url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    sha256 = "sha256-sNzgQil+hlrdM1Ha1394wsdjjWYy9YNXsBXlDty9IYY=";
+    sha256 = "sha256-mQUoJ4HO0/mXabDkWnBey1AZLKFiIwBwezMC6hZ9yIM=";
  };

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

 stdenv.mkDerivation rec {
  pname = "httplib";
-  version = "0.12.4";
+  version = "0.12.5";

  src = fetchFromGitHub {
    owner = "yhirose";
    repo = "cpp-httplib";
    rev = "v${version}";
-    hash = "sha256-tofgBLjVOuHgQW1iwOJER3VTj4L/uG0cBbaoXaKBWE0=";
+    hash = "sha256-9qCquF6DXpgtrfXVd/hc8n1Eu1nOxf/Lm+R13QI0N9Q=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/libraries/rocfft/default.nix
+++ b/pkgs/development/libraries/rocfft/default.nix
@ -1,199 +1,243 @@
-{ lib
+{ rocfft
+, lib
 , stdenv
 , fetchFromGitHub
 , rocmUpdateScript
-, runCommand
 , cmake
-, rocm-cmake
-, rocrand
 , hip
-, openmp
-, sqlite
 , python3
-, gtest
+, rocm-cmake
+, sqlite
 , boost
 , fftw
 , fftwFloat
-, buildTests ? false
-, buildBenchmarks ? false
+, gtest
+, openmp
+, rocrand
+# NOTE: Update the default GPU targets on every update
+, gpuTargets ? [
+  "gfx803"
+  "gfx900"
+  "gfx906"
+  "gfx908"
+  "gfx90a"
+  "gfx1030"
+  "gfx1100"
+  "gfx1102"
+]
 }:

 let
-  name-zero = "librocfft-device-0.so.0.1";
-  name-one = "librocfft-device-1.so.0.1";
-  name-two = "librocfft-device-2.so.0.1";
-  name-three = "librocfft-device-3.so.0.1";
+  # To avoid output limit exceeded errors in hydra, we build kernel
+  # device libs and the kernel RTC cache database in separate derivations
+  kernelDeviceLibs = map
+    (target:
+      (rocfft.overrideAttrs (prevAttrs: {
+        pname = "rocfft-device-${target}";

-  # This is over 3GB, to allow hydra caching we separate it
-  rf = stdenv.mkDerivation (finalAttrs: {
-    pname = "rocfft";
-    version = "5.4.3";
+        patches = prevAttrs.patches ++ [
+          # Add back install rule for device library
+          # This workaround is needed because rocm_install_targets
+          # doesn't support an EXCLUDE_FROM_ALL option
+          ./device-install.patch
+        ];

-    outputs = [
-      "out"
-      "libzero"
-      "libone"
-      "libtwo"
-      "libthree"
-    ] ++ lib.optionals buildTests [
-      "test"
-    ] ++ lib.optionals buildBenchmarks [
-      "benchmark"
-    ];
+        buildFlags = [ "rocfft-device-${target}" ];

-    src = fetchFromGitHub {
-      owner = "ROCmSoftwarePlatform";
-      repo = "rocFFT";
-      rev = "rocm-${finalAttrs.version}";
-      hash = "sha256-FsefE0B2hF5ZcHDB6TscwFeZ1NKFkWX7VDpEvvbDbOk=";
-    };
+        installPhase = ''
+          runHook preInstall
+          cmake --install . --component device
+          runHook postInstall
+        '';

-    nativeBuildInputs = [
-      cmake
-      rocm-cmake
-      hip
-    ];
+        requiredSystemFeatures = [ "big-parallel" ];
+      })).override {
+        gpuTargets = [ target ];
+      }
+    )
+    gpuTargets;

-    buildInputs = [
-      sqlite
-      python3
-    ] ++ lib.optionals buildTests [
-      gtest
-    ] ++ lib.optionals (buildTests || buildBenchmarks) [
-      rocrand
-      boost
-      fftw
-      fftwFloat
-      openmp
-    ];
+  # TODO: Figure out how to also split this by GPU target
+  #
+  # It'll be bit more complicated than what we're doing for the kernel
+  # device libs, because the kernel cache needs to be compiled into
+  # one sqlite database (whereas the device libs can be linked into
+  # rocfft as separate libraries for each GPU target).
+  #
+  # It's not clear why this needs to even be a db in the first place.
+  # It would simplify things A LOT if we could just store these
+  # pre-compiled kernels as files (but that'd need a lot of patching).
+  kernelRtcCache = rocfft.overrideAttrs (_: {
+    pname = "rocfft-kernel-cache";

-    propagatedBuildInputs = lib.optionals buildTests [
-      fftw
-      fftwFloat
-    ];
+    buildFlags = [ "rocfft_kernel_cache_target" ];

-    cmakeFlags = [
-      "-DCMAKE_C_COMPILER=hipcc"
-      "-DCMAKE_CXX_COMPILER=hipcc"
-      "-DUSE_HIP_CLANG=ON"
-      "-DSQLITE_USE_SYSTEM_PACKAGE=ON"
-      # Manually define CMAKE_INSTALL_<DIR>
-      # See: https://github.com/NixOS/nixpkgs/pull/197838
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    ] ++ lib.optionals buildTests [
-      "-DBUILD_CLIENTS_TESTS=ON"
-    ] ++ lib.optionals buildBenchmarks [
-      "-DBUILD_CLIENTS_RIDER=ON"
-      "-DBUILD_CLIENTS_SAMPLES=ON"
-    ];
-
-    postInstall = ''
-      mv $out/lib/${name-zero} $libzero
-      mv $out/lib/${name-one} $libone
-      mv $out/lib/${name-two} $libtwo
-      mv $out/lib/${name-three} $libthree
-      ln -s $libzero $out/lib/${name-zero}
-      ln -s $libone $out/lib/${name-one}
-      ln -s $libtwo $out/lib/${name-two}
-      ln -s $libthree $out/lib/${name-three}
-    '' + lib.optionalString buildTests ''
-      mkdir -p $test/{bin,lib/fftw}
-      cp -a $out/bin/* $test/bin
-      ln -s ${fftw}/lib/libfftw*.so $test/lib/fftw
-      ln -s ${fftwFloat}/lib/libfftw*.so $test/lib/fftw
-      rm -r $out/lib/fftw
-      rm $test/bin/{rocfft_rtc_helper,*-rider} || true
-    '' + lib.optionalString buildBenchmarks ''
-      mkdir -p $benchmark/bin
-      cp -a $out/bin/* $benchmark/bin
-      rm $benchmark/bin/{rocfft_rtc_helper,*-test} || true
-    '' + lib.optionalString (buildTests || buildBenchmarks ) ''
-      mv $out/bin/rocfft_rtc_helper $out
-      rm -r $out/bin/*
-      mv $out/rocfft_rtc_helper $out/bin
+    installPhase = ''
+      runHook preInstall
+      cmake --install . --component kernel_cache
+      runHook postInstall
    '';

-    passthru.updateScript = rocmUpdateScript {
+    requiredSystemFeatures = [ "big-parallel" ];
+  });
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "rocfft";
+  version = "5.4.3";
+
+  src = fetchFromGitHub {
+    owner = "ROCmSoftwarePlatform";
+    repo = "rocFFT";
+    rev = "rocm-${finalAttrs.version}";
+    hash = "sha256-FsefE0B2hF5ZcHDB6TscwFeZ1NKFkWX7VDpEvvbDbOk=";
+  };
+
+  patches = [
+    # Exclude kernel compilation & installation from "all" target,
+    # and split device libraries by GPU target
+    ./split-kernel-compilation.patch
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    hip
+    python3
+    rocm-cmake
+  ];
+
+  buildInputs = [
+    sqlite
+  ] ++ lib.optionals (finalAttrs.pname == "rocfft") kernelDeviceLibs;
+
+  cmakeFlags = [
+    "-DCMAKE_C_COMPILER=hipcc"
+    "-DCMAKE_CXX_COMPILER=hipcc"
+    "-DUSE_HIP_CLANG=ON"
+    "-DSQLITE_USE_SYSTEM_PACKAGE=ON"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
+  ];
+
+  postInstall = lib.optionalString (finalAttrs.pname == "rocfft") ''
+    ln -s ${kernelRtcCache}/lib/rocfft_kernel_cache.db "$out/lib"
+  '';
+
+  passthru = {
+    test = stdenv.mkDerivation {
+      pname = "${finalAttrs.pname}-test";
+      inherit (finalAttrs) version src;
+
+      sourceRoot = "source/clients/tests";
+
+      nativeBuildInputs = [
+        cmake
+        hip
+        rocm-cmake
+      ];
+
+      buildInputs = [
+        boost
+        fftw
+        fftwFloat
+        finalAttrs.finalPackage
+        gtest
+        openmp
+        rocrand
+      ];
+
+      cmakeFlags = [
+        "-DCMAKE_C_COMPILER=hipcc"
+        "-DCMAKE_CXX_COMPILER=hipcc"
+      ];
+
+      postInstall = ''
+        rm -r "$out/lib/fftw"
+        rmdir "$out/lib"
+      '';
+    };
+
+    benchmark = stdenv.mkDerivation {
+      pname = "${finalAttrs.pname}-benchmark";
+      inherit (finalAttrs) version src;
+
+      sourceRoot = "source/clients/rider";
+
+      nativeBuildInputs = [
+        cmake
+        hip
+        rocm-cmake
+      ];
+
+      buildInputs = [
+        boost
+        finalAttrs.finalPackage
+        openmp
+        (python3.withPackages (ps: with ps; [
+          pandas
+          scipy
+        ]))
+        rocrand
+      ];
+
+      cmakeFlags = [
+        "-DCMAKE_C_COMPILER=hipcc"
+        "-DCMAKE_CXX_COMPILER=hipcc"
+      ];
+
+      postInstall = ''
+        cp -a ../../../scripts/perf "$out/bin"
+      '';
+    };
+
+    samples = stdenv.mkDerivation {
+      pname = "${finalAttrs.pname}-samples";
+      inherit (finalAttrs) version src;
+
+      sourceRoot = "source/clients/samples";
+
+      nativeBuildInputs = [
+        cmake
+        hip
+        rocm-cmake
+      ];
+
+      buildInputs = [
+        boost
+        finalAttrs.finalPackage
+        openmp
+        rocrand
+      ];
+
+      cmakeFlags = [
+        "-DCMAKE_C_COMPILER=hipcc"
+        "-DCMAKE_CXX_COMPILER=hipcc"
+      ];
+
+      installPhase = ''
+        runHook preInstall
+        mkdir "$out"
+        cp -a bin "$out"
+        runHook postInstall
+      '';
+    };
+
+    updateScript = rocmUpdateScript {
      name = finalAttrs.pname;
      owner = finalAttrs.src.owner;
      repo = finalAttrs.src.repo;
    };
+  };

-    meta = with lib; {
-      description = "FFT implementation for ROCm ";
-      homepage = "https://github.com/ROCmSoftwarePlatform/rocFFT";
-      license = with licenses; [ mit ];
-      maintainers = teams.rocm.members;
-      platforms = platforms.linux;
-      broken = versions.minor finalAttrs.version != versions.minor hip.version;
-    };
-  });
-
-  rf-zero = runCommand name-zero { preferLocalBuild = true; } ''
-    cp -a ${rf.libzero} $out
-  '';
-
-  rf-one = runCommand name-one { preferLocalBuild = true; } ''
-    cp -a ${rf.libone} $out
-  '';
-
-  rf-two = runCommand name-two { preferLocalBuild = true; } ''
-    cp -a ${rf.libtwo} $out
-  '';
-
-  rf-three = runCommand name-three { preferLocalBuild = true; } ''
-    cp -a ${rf.libthree} $out
-  '';
-in stdenv.mkDerivation {
-  inherit (rf) pname version src passthru meta;
-
-  outputs = [
-    "out"
-  ] ++ lib.optionals buildTests [
-    "test"
-  ] ++ lib.optionals buildBenchmarks [
-    "benchmark"
-  ];
-
-  dontUnpack = true;
-  dontPatch = true;
-  dontConfigure = true;
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/lib
-    ln -sf ${rf-zero} $out/lib/${name-zero}
-    ln -sf ${rf-one} $out/lib/${name-one}
-    ln -sf ${rf-two} $out/lib/${name-two}
-    ln -sf ${rf-three} $out/lib/${name-three}
-    cp -an ${rf}/* $out
-  '' + lib.optionalString buildTests ''
-    cp -a ${rf.test} $test
-  '' + lib.optionalString buildBenchmarks ''
-    cp -a ${rf.benchmark} $benchmark
-  '' + ''
-    runHook postInstall
-  '';
-
-  # Fix paths
-  preFixup = ''
-    substituteInPlace $out/include/*.h $out/rocfft/include/*.h \
-      --replace "${rf}" "$out"
-
-    patchelf --set-rpath \
-      $(patchelf --print-rpath $out/lib/librocfft.so | sed 's,${rf}/lib,'"$out/lib"',') \
-      $out/lib/librocfft.so
-  '' + lib.optionalString buildTests ''
-    patchelf --set-rpath \
-      $(patchelf --print-rpath $test/bin/rocfft-test | sed 's,${rf}/lib,'"$out/lib"',') \
-      $test/bin/rocfft-test
-  '' + lib.optionalString buildBenchmarks ''
-    patchelf --set-rpath \
-      $(patchelf --print-rpath $benchmark/bin/rocfft-rider | sed 's,${rf}/lib,'"$out/lib"',') \
-      $benchmark/bin/rocfft-rider
-  '';
-}
+  meta = with lib; {
+    description = "FFT implementation for ROCm";
+    homepage = "https://github.com/ROCmSoftwarePlatform/rocFFT";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ kira-bruneau ] ++ teams.rocm.members;
+    platforms = platforms.linux;
+    broken = versions.minor finalAttrs.version != versions.minor hip.version;
+  };
+})
--- a/pkgs/development/libraries/rocfft/device-install.patch
+++ b/pkgs/development/libraries/rocfft/device-install.patch
@ -0,0 +1,15 @@
+diff --git a/library/src/device/CMakeLists.txt b/library/src/device/CMakeLists.txt
+index 73a8ec9..9bfd4b8 100644
+--- a/library/src/device/CMakeLists.txt
+++ b/library/src/device/CMakeLists.txt
+@@ -255,4 +255,10 @@ foreach( sub ${AMDGPU_TARGETS} )
+   if( NOT BUILD_SHARED_LIBS )
+     set_target_properties( rocfft-device-${sub} PROPERTIES PREFIX "lib" )
+   endif( )
+
+  rocm_install_targets(
+    TARGETS
+    rocfft-device-${sub}
+    COMPONENT device
+  )
+ endforeach()
--- a/pkgs/development/libraries/rocfft/split-kernel-compilation.patch
+++ b/pkgs/development/libraries/rocfft/split-kernel-compilation.patch
@ -0,0 +1,124 @@
+diff --git a/library/src/CMakeLists.txt b/library/src/CMakeLists.txt
+index 3a16304..606b711 100644
+--- a/library/src/CMakeLists.txt
+++ b/library/src/CMakeLists.txt
+@@ -250,12 +250,12 @@ foreach( target
+ 
+ endforeach()
+ 
+-add_executable( rocfft_aot_helper
+add_executable( rocfft_aot_helper EXCLUDE_FROM_ALL
+   rocfft_aot_helper.cpp
+   rocfft_stub.cpp
+ )
+ 
+-add_executable( rocfft_config_search
+add_executable( rocfft_config_search EXCLUDE_FROM_ALL
+   rocfft_config_search.cpp
+   rocfft_stub.cpp
+ )
+@@ -279,10 +279,10 @@ endif()
+ 
+ target_link_libraries( rocfft PRIVATE ${ROCFFT_DEVICE_LINK_LIBS} )
+ 
+-target_link_libraries( rocfft PRIVATE rocfft-device-0 )
+-target_link_libraries( rocfft PRIVATE rocfft-device-1 )
+-target_link_libraries( rocfft PRIVATE rocfft-device-2 )
+-target_link_libraries( rocfft PRIVATE rocfft-device-3 )
+foreach( sub ${AMDGPU_TARGETS} )
+  target_link_libraries( rocfft PRIVATE -lrocfft-device-${sub} )
+endforeach()
+
+ foreach( target rocfft rocfft_aot_helper rocfft_config_search )
+   # RTC uses dladdr to find the RTC helper program
+   if( NOT WIN32 )
+@@ -347,7 +347,7 @@ add_custom_command(
+   DEPENDS rocfft_aot_helper rocfft_rtc_helper
+   COMMENT "Compile kernels into shipped cache file"
+ )
+-add_custom_target( rocfft_kernel_cache_target ALL
+add_custom_target( rocfft_kernel_cache_target
+   DEPENDS rocfft_kernel_cache.db
+   VERBATIM
+ )
+@@ -392,7 +392,8 @@ else()
+ endif()
+ rocm_install(FILES ${ROCFFT_KERNEL_CACHE_PATH}
+   DESTINATION "${ROCFFT_KERNEL_CACHE_INSTALL_DIR}"
+-  COMPONENT runtime
+  COMPONENT kernel_cache
+  EXCLUDE_FROM_ALL
+ )
+ 
+ #         PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
+diff --git a/library/src/device/CMakeLists.txt b/library/src/device/CMakeLists.txt
+index 9f7b85f..73a8ec9 100644
+--- a/library/src/device/CMakeLists.txt
+++ b/library/src/device/CMakeLists.txt
+@@ -170,11 +170,11 @@ list( SORT rocfft_device_source )
+ # functions callable by rocFFT and depends on amdhip64, and another
+ # one usable by AOT RTC that contains no device code
+ list( FILTER rocfft_device_source EXCLUDE REGEX function_pool.cpp )
+-add_library( rocfft-function-pool OBJECT
+add_library( rocfft-function-pool OBJECT EXCLUDE_FROM_ALL
+   function_pool.cpp
+ )
+ target_compile_definitions( rocfft-function-pool PRIVATE FUNCTION_POOL_STANDALONE_BODY= )
+-add_library( rocfft-function-pool-standalone OBJECT
+add_library( rocfft-function-pool-standalone OBJECT EXCLUDE_FROM_ALL
+   function_pool.cpp
+ )
+ target_compile_definitions( rocfft-function-pool-standalone PRIVATE FUNCTION_POOL_STANDALONE_BODY={} )
+@@ -193,26 +193,15 @@ foreach( pool rocfft-function-pool rocfft-function-pool-standalone )
+   add_dependencies(${pool} gen_headers_target)
+ endforeach()
+ 
+-list( LENGTH rocfft_device_source rocfft_device_source_len )
+-math(EXPR split_len "${rocfft_device_source_len} / 4")
+-math(EXPR split_idx_2 "${rocfft_device_source_len} / 4 * 2")
+-math(EXPR split_idx_3 "${rocfft_device_source_len} / 4 * 3")
+-
+-list( SUBLIST rocfft_device_source 0 ${split_len} rocfft_device_source_0 )
+-list( SUBLIST rocfft_device_source ${split_len} ${split_len} rocfft_device_source_1 )
+-list( SUBLIST rocfft_device_source ${split_idx_2} ${split_len} rocfft_device_source_2 )
+-list( SUBLIST rocfft_device_source ${split_idx_3} -1 rocfft_device_source_3 )
+-
+-foreach( sub RANGE 3 )
+-  set( rocfft_device_source_var rocfft_device_source_${sub} )
+foreach( sub ${AMDGPU_TARGETS} )
+   if(NOT SINGLELIB)
+-    add_library( rocfft-device-${sub}
+-      ${${rocfft_device_source_var}} )
+    add_library( rocfft-device-${sub} EXCLUDE_FROM_ALL
+      ${rocfft_device_source} )
+   else()
+     # Compile the device lib as a static library, which is then linked
+     # into librocfft.so Useful for testing purposes.
+-    add_library( rocfft-device-${sub} STATIC
+-      ${${rocfft_device_source_var}} )
+    add_library( rocfft-device-${sub} STATIC EXCLUDE_FROM_ALL
+      ${rocfft_device_source} )
+ 
+     # if we're building singlelib, we don't want to export any of the
+     # device library symbols to the main library
+@@ -241,9 +230,7 @@ foreach( sub RANGE 3 )
+   # Set AMD GPU architecture options
+ 
+   # Enable compilation of desired architectures
+-  foreach( target ${AMDGPU_TARGETS} )
+-    target_compile_options( rocfft-device-${sub} PRIVATE --offload-arch=${target} )
+-  endforeach( )
+  target_compile_options( rocfft-device-${sub} PRIVATE --offload-arch=${sub} )
+ 
+   target_include_directories( rocfft-device-${sub}
+     PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+@@ -268,9 +255,4 @@ foreach( sub RANGE 3 )
+   if( NOT BUILD_SHARED_LIBS )
+     set_target_properties( rocfft-device-${sub} PROPERTIES PREFIX "lib" )
+   endif( )
+-
+-  rocm_install_targets(
+-    TARGETS
+-    rocfft-device-${sub}
+-    )
+ endforeach()
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@ -27,11 +27,11 @@

 stdenv.mkDerivation rec {
  pname = "spice";
-  version = "0.15.1";
+  version = "0.15.2";

  src = fetchurl {
    url = "https://www.spice-space.org/download/releases/spice-server/${pname}-${version}.tar.bz2";
-    sha256 = "ramvZ6syGRa9frWePWGaSneWwIooxzLt/H8C/ICxo3o=";
+    sha256 = "sha256-bZ62EX8DkXRxxLwQAEq+z/SKefuF64WhxF8CM3cBW4E=";
  };

  patches = [
@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
  postPatch = ''
    patchShebangs build-aux

-    # Forgotten in 0.15.1 tarball
+    # Forgotten in 0.15.2 tarball
    sed -i /meson.add_dist_script/d meson.build
  '';

--- a/pkgs/development/libraries/tcl-fcgi/default.nix
+++ b/pkgs/development/libraries/tcl-fcgi/default.nix
@ -0,0 +1,31 @@
+{ lib, fetchFromGitHub, tcl, tclx }:
+
+tcl.mkTclDerivation rec {
+  pname = "tcl-fcgi";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "mpcjanssen";
+    repo = "tcl-fcgi";
+    rev = "62452dbf3177ba9458fbb42457834ca77bdf5a82";
+    sha256 = "sha256-RLuV4ARmGWCJTmhs7DbMWENQGj3d5ZXWb821WrgG0qA=";
+  };
+
+  buildInputs = [
+    tclx
+  ];
+
+  unpackPhase = ''
+    mkdir -p $out/lib/tcl-fcgi
+    cp -r $src/tcl-src/* $out/lib/tcl-fcgi/
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/mpcjanssen/tcl-fcgi";
+    description = "Tcl interface for the FastCGI protocol";
+    license = licenses.bsd2;
+    platforms = tclx.meta.platforms;
+    maintainers = with maintainers; [ nat-418 ];
+  };
+}
+
--- a/pkgs/development/libraries/zchunk/default.nix
+++ b/pkgs/development/libraries/zchunk/default.nix
@ -11,13 +11,13 @@

 stdenv.mkDerivation rec {
  pname = "zchunk";
-  version = "1.3.0";
+  version = "1.3.1";

  src = fetchFromGitHub {
    owner = "zchunk";
    repo = pname;
    rev = version;
-    hash = "sha256-9T1u2Qvy2gRUQzgAp81x+tSbHXuEoxhYhS1T9XntvKk=";
+    hash = "sha256-mZc8DC26c4hZzHsozhBmuvaIjL3ifQ7GYYGDEsBBPKc=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/perl-modules/TextBibTeX-use-lib-on-aarch64.patch
+++ b/pkgs/development/perl-modules/TextBibTeX-use-lib-on-aarch64.patch
@ -5,7 +5,7 @@
 }
 else {
 -    if ( $Config{archname} =~ /^x86_64|^ppc64|^s390x|^aarch64|^riscv64/ ) {
-+    if ( $Config{archname} =~ /^x86_64|^ppc64|^s390x|^riscv64/ ) {
+    if ( 0 ) {
         $libdir =~ s/\bbin\b/lib64/;
         if ( !-d $libdir ) {
             my $test = $libdir;
--- a/pkgs/development/python-modules/aigpy/default.nix
+++ b/pkgs/development/python-modules/aigpy/default.nix
@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, mutagen
+, requests
+, colorama
+, prettytable
+, pycrypto
+, pydub
+}:
+
+buildPythonPackage rec {
+  pname = "aigpy";
+  version = "2022.7.8.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-1kQced6YdC/wvegqFVhZfej4+4aemGXvKysKjejP13w=";
+  };
+
+  propagatedBuildInputs = [ mutagen requests colorama prettytable pycrypto pydub ];
+
+  meta = {
+    homepage = "https://github.com/AIGMix/AIGPY";
+    description = "A python library with miscellaneous tools";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.misterio77 ];
+    platforms = lib.platforms.all;
+  };
+}
--- a/pkgs/development/python-modules/aiohomekit/default.nix
+++ b/pkgs/development/python-modules/aiohomekit/default.nix
@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "aiohomekit";
-  version = "2.6.3";
+  version = "2.6.4";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "Jc2k";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-bVvz5ruc1OpRnSKso3XHAnppnN/4ySfRHodE787eLFw=";
+    hash = "sha256-98VoRo3gxS70M/R0HYEK5VItJWcwMi8Z3r2eJ5lEeMw=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/art/default.nix
+++ b/pkgs/development/python-modules/art/default.nix
@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+  pname = "art";
+  version = "5.9";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "sepandhaghighi";
+    repo = "art";
+    rev = "v${version}";
+    hash = "sha256-3fX0kYYyeJ9tHX8/+hlv5aRE6LujXW915N5Ov6Q+EW8=";
+  };
+
+  pythonImportsCheck = [ "art" ];
+
+  # TypeError: art() missing 1 required positional argument: 'artname'
+  checkPhase = ''
+    runHook preCheck
+
+    $out/bin/art
+    $out/bin/art test
+    $out/bin/art test2
+
+    runHook postCheck
+  '';
+
+  meta = with lib; {
+    description = "ASCII art library for Python";
+    homepage = "https://github.com/sepandhaghighi/art";
+    changelog = "https://github.com/sepandhaghighi/art/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
--- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "azure-mgmt-recoveryservices";
-  version = "2.3.0";
+  version = "2.4.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    inherit pname version;
    extension = "zip";
-    hash = "sha256-4L6Tqgvqh+nJyeXMolSpQ/2knAED75RQqD/lUDOt5ek=";
+    hash = "sha256-2JeOvtNxx6Z3AY4GI9fBRKbMcYVHsbrhk8C+5t5eelk=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/class-doc/default.nix
+++ b/pkgs/development/python-modules/class-doc/default.nix
@ -0,0 +1,49 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, more-itertools
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "class-doc";
+  version = "0.2.6";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "danields761";
+    repo = "${pname}";
+    rev = "9b122d85ce667d096ebee75a49350bbdbd48686d"; # no 0.2.6 version tag
+    hash = "sha256-4Sn/TuBvBpl1nvJBg327+sVrjGavkYKEYP32DwLWako=";
+  };
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  postPatch = ''
+    substituteInPlace pyproject.toml --replace \
+      "poetry.masonry.api" \
+      "poetry.core.masonry.api"
+  '';
+
+  propagatedBuildInputs = [
+    more-itertools
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "class_doc"
+  ];
+
+  meta = with lib; {
+    description = "Extract attributes docstrings defined in various ways";
+    homepage = "https://github.com/danields761/class-doc";
+    license = licenses.mit;
+    maintainers = with maintainers; [ gador ];
+  };
+}
--- a/pkgs/development/python-modules/cwl-upgrader/default.nix
+++ b/pkgs/development/python-modules/cwl-upgrader/default.nix
@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "cwl-upgrader";
-  version = "1.2.7";
+  version = "1.2.8";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "common-workflow-language";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-/vCvpRpQkdMkqlK5/0jJTY56ROoB4ezvX9ma1AVWYd4=";
+    hash = "sha256-DwXwzhsv92t6PU4emmG7xlIU7uj3rcHh4+o9NqBMA+A=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/django-vite/default.nix
+++ b/pkgs/development/python-modules/django-vite/default.nix
@ -7,7 +7,7 @@

 buildPythonPackage rec {
  pname = "django-vite";
-  version = "2.1.0";
+  version = "2.1.1";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
    owner = "MrBin99";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-yRZA5CDkJbQt7aSVL7V90Z+0jAqh7JC/d8pLSI/yexk=";
+    hash = "sha256-MKAzNtmFue7MrYtg5sOXog1u1daJwh3t98aIUSyyfBQ=";
  };

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

 buildPythonPackage rec {
  pname = "dtlssocket";
-  version = "0.1.14";
+  version = "0.1.15";

  format = "pyproject";

  src = fetchPypi {
    pname = "DTLSSocket";
    inherit version;
-    hash = "sha256-BLNfdKDKUvc+BJnhLqx7VzJg0opvrdaXhNLCigLH02k=";
+    hash = "sha256-RWscUxJsmLkI2GPjnpS1oJVPsJ+xbqPAKk4Q1G7ISu4=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/dvc-data/default.nix
+++ b/pkgs/development/python-modules/dvc-data/default.nix
@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "dvc-data";
-  version = "0.53.0";
+  version = "0.54.2";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "iterative";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-RPLsn2IyegfpVtBNupUJCOaewtXGq0bmYToe2GEYBf0=";
+    hash = "sha256-wvb+GcNt9oCe3B21GHCCFLL8Zy0QzaxrVwHFK5ZmqRY=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
--- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix
+++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix
@ -11,14 +11,14 @@

 buildPythonPackage rec {
  pname = "ffmpeg-progress-yield";
-  version = "0.7.4";
+  version = "0.7.8";
  format = "setuptools";

  disabled = pythonOlder "3.8";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-gBWkoR0cJdcWShX9aIDt6DpK1dkT9bfvgnrgXGgZPSQ=";
+    hash = "sha256-muauX4Mq58ew9lGPE0H+bu4bqPydNADLocujjy6qRh4=";
  };

  propagatedBuildInputs = [ colorama tqdm ];
--- a/pkgs/development/python-modules/furo/default.nix
+++ b/pkgs/development/python-modules/furo/default.nix
@ -2,6 +2,7 @@
 , buildPythonPackage
 , pythonOlder
 , fetchPypi
+, pythonRelaxDepsHook
 , sphinx
 , beautifulsoup4
 , sphinx-basic-ng
@ -9,7 +10,7 @@

 buildPythonPackage rec {
  pname = "furo";
-  version = "2023.3.27";
+  version = "2023.5.20";
  format = "wheel";

  disable = pythonOlder "3.7";
@ -18,9 +19,17 @@ buildPythonPackage rec {
    inherit pname version format;
    dist = "py3";
    python = "py3";
-    hash = "sha256-SrK+JUotXlJ5LQynk6EsNVgt0JiXIopt1HiF2r1clSE=";
+    hash = "sha256-WUqENt3+DAcfOp6aIJwxSiGdg0Hz8a8z/ffGlUT6ueY=";
  };

+  nativeBuildInputs = [
+    pythonRelaxDepsHook
+  ];
+
+  pythonRelaxDeps = [
+    "sphinx"
+  ];
+
  propagatedBuildInputs = [
    sphinx
    beautifulsoup4
--- a/pkgs/development/python-modules/geometric/ase-is-optional.patch
+++ b/pkgs/development/python-modules/geometric/ase-is-optional.patch
@ -1,50 +0,0 @@
-From aff6e4411980ac9cbe112a050c3a34ba7e305a43 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Roberto=20Di=20Remigio=20Eik=C3=A5s?=
- <robertodr@users.noreply.github.com>
-Date: Fri, 11 Nov 2022 09:20:25 +0100
-Subject: [PATCH] Do not import ASE stuff at the top
-
-Since it is an optional add-on and it's not listed in the installation requirements.
---
- geometric/tests/test_ase_engine.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/geometric/tests/test_ase_engine.py b/geometric/tests/test_ase_engine.py
-index 8750763..34239b5 100644
--- a/geometric/tests/test_ase_engine.py
-+++ b/geometric/tests/test_ase_engine.py
-@@ -10,7 +10,6 @@
- - geometry optimisation w/ ASE internal calc
- """
- import numpy as np
-from ase.calculators.lj import LennardJones
- from pytest import fixture, raises
- 
- from geometric.ase_engine import EngineASE
-@@ -37,6 +36,8 @@ def molecule_h2o() -> Molecule:
- 
- @using_ase
- def test_construction(molecule_h2o):
-+    from ase.calculators.lj import LennardJones
-+
-     lj_calc = LennardJones()
-     engine = EngineASE(molecule_h2o, lj_calc)
-     assert engine.calculator == lj_calc
-@@ -44,6 +45,8 @@ def test_construction(molecule_h2o):
- 
- @using_ase
- def test_from_args(molecule_h2o):
-+    from ase.calculators.lj import LennardJones
-+
-     lj_calc = LennardJones(sigma=1.4, epsilon=3.0)
- 
-     # create equivalent engines in two ways
-@@ -68,6 +71,8 @@ def test_from_args(molecule_h2o):
- 
- @using_ase
- def test_from_string(molecule_h2o):
-+    from ase.calculators.lj import LennardJones
-+
-     engine = EngineASE.from_calculator_string(
-         molecule_h2o, calculator_import="ase.calculators.lj.LennardJones"
-     )
--- a/pkgs/development/python-modules/geometric/default.nix
+++ b/pkgs/development/python-modules/geometric/default.nix
@ -1,6 +1,7 @@
 { buildPythonPackage
 , lib
 , fetchFromGitHub
+, fetchpatch
 , networkx
 , numpy
 , scipy
@ -10,18 +11,20 @@

 buildPythonPackage rec {
  pname = "geometric";
-  version = "1.0";
+  version = "1.0.1";

  src = fetchFromGitHub {
    owner = "leeping";
    repo = "geomeTRIC";
    rev = version;
-    hash = "sha256-y8dh4vZ/d1KL1EpDrle8CH/KIDMCKKZdAyJVgUFjx/o=";
+    hash = "sha256-3d4z1n8+e0HgdeKLNSsHLb3XHOk09uy+gP9AwNvNITE=";
  };

-  patches = [
-    ./ase-is-optional.patch
-  ];
+  patches = [ (fetchpatch {
+    name = "ase-is-optional";
+    url = "https://github.com/leeping/geomeTRIC/commit/aff6e4411980ac9cbe112a050c3a34ba7e305a43.patch";
+    hash = "sha256-JGGPX+JwkQ8Imgmyx+ReRTV+k6mxHYgm+Nd8WUjbFEg=";
+  }) ];

  propagatedBuildInputs = [
    networkx
--- a/pkgs/development/python-modules/google-cloud-redis/default.nix
+++ b/pkgs/development/python-modules/google-cloud-redis/default.nix
@ -11,14 +11,14 @@

 buildPythonPackage rec {
  pname = "google-cloud-redis";
-  version = "2.12.1";
+  version = "2.13.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-gQ3xG2QcnrSvl1hsvlcY9g77JW8fFk/Pci01tNqpAUs=";
+    hash = "sha256-BKDbtyn1wnzTXM6B7lgUCe17NLB9yaj1XhMbP4zE3Qo=";
  };

  propagatedBuildInputs = [
--- a/Show More
+++ b/Show More