Merge master into haskell-updates

2024-11-17 15:22:59 +01:00 · 2023-03-25 00:12:18 +00:00 · 2023-03-25 00:12:18 +00:00 · bca997abb7
commit bca997abb7
parent 265a3a3b15 0ee208011d
206 changed files with 4536 additions and 2486 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -7433,6 +7433,13 @@
    githubId = 7673602;
    name = "Jonathan Ringer";
  };
+  jopejoe1 = {
+    email = "johannes@joens.email";
+    matrix = "@jopejoe1:matrix.org";
+    github = "jopejoe1";
+    githubId = 34899572;
+    name = "Johannes Jöns";
+  };
  jordanisaacs = {
    name = "Jordan Isaacs";
    email = "nix@jdisaacs.com";
@ -14178,6 +14185,16 @@
    githubId = 6277322;
    name = "Wei Tang";
  };
+  soywod = {
+    name = "Clément DOUIN";
+    email = "clement.douin@posteo.net";
+    matrix = "@soywod:matrix.org";
+    github = "soywod";
+    githubId = 10437171;
+    keys = [{
+      fingerprint = "75F0 AB7C FE01 D077 AEE6  CAFD 353E 4A18 EE0F AB72";
+    }];
+  };
  spacefrogg = {
    email = "spacefrogg-nixos@meterriblecrew.net";
    github = "spacefrogg";
@ -15151,6 +15168,12 @@
    githubId = 1391883;
    name = "Tom Hall";
  };
+  thubrecht = {
+    email = "tom@hubrecht.ovh";
+    github = "Tom-Hubrecht";
+    githubId = 26650391;
+    name = "Tom Hubrecht";
+  };
  Thunderbottom = {
    email = "chinmaydpai@gmail.com";
    github = "Thunderbottom";
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@ -335,3 +335,5 @@ In addition to numerous new and upgraded packages, this release has the followin
 - The option `services.prometheus.exporters.pihole.interval` does not exist anymore and has been removed.

 - `k3s` can now be configured with an EnvironmentFile for its systemd service, allowing secrets to be provided without ending up in the Nix Store.
+
+- `boot.initrd.luks.device.<name>` has a new `tryEmptyPassphrase` option, this is useful for OEM's who need to install an encrypted disk with a future settable passphrase
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@ -699,7 +699,20 @@ in {
              users.groups.${user.name} = {};
            '';
          }
-        ]
+        ] ++ (map (shell: {
+            assertion = (user.shell == pkgs.${shell}) -> (config.programs.${shell}.enable == true);
+            message = ''
+              users.users.${user.name}.shell is set to ${shell}, but
+              programs.${shell}.enable is not true. This will cause the ${shell}
+              shell to lack the basic nix directories in its PATH and might make
+              logging in as that user impossible. You can fix it with:
+              programs.${shell}.enable = true;
+            '';
+          }) [
+          "fish"
+          "xonsh"
+          "zsh"
+        ])
    ));

    warnings =
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@ -240,7 +240,7 @@ in
          [
            ./known_hosts
            (writeText "github.keys" '''
-              github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+              github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=
              github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
              github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
            ''')
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@ -158,6 +158,20 @@ let
      wait_target "header" ${dev.header} || die "${dev.header} is unavailable"
    ''}

+    try_empty_passphrase() {
+        ${if dev.tryEmptyPassphrase then ''
+             echo "Trying empty passphrase!"
+             echo "" | ${csopen}
+             cs_status=$?
+             if [ $cs_status -eq 0 ]; then
+                 return 0
+             else
+                 return 1
+             fi
+        '' else "return 1"}
+    }
+
+
    do_open_passphrase() {
        local passphrase

@ -212,13 +226,27 @@ let
            ${csopen} --key-file=${dev.keyFile} \
              ${optionalString (dev.keyFileSize != null) "--keyfile-size=${toString dev.keyFileSize}"} \
              ${optionalString (dev.keyFileOffset != null) "--keyfile-offset=${toString dev.keyFileOffset}"}
+            cs_status=$?
+            if [ $cs_status -ne 0 ]; then
+              echo "Key File ${dev.keyFile} failed!"
+              if ! try_empty_passphrase; then
+                ${if dev.fallbackToPassword then "echo" else "die"} "${dev.keyFile} is unavailable"
+                echo " - failing back to interactive password prompt"
+                do_open_passphrase
+              fi
+            fi
        else
-            ${if dev.fallbackToPassword then "echo" else "die"} "${dev.keyFile} is unavailable"
-            echo " - failing back to interactive password prompt"
-            do_open_passphrase
+            # If the key file never shows up we should also try the empty passphrase
+            if ! try_empty_passphrase; then
+               ${if dev.fallbackToPassword then "echo" else "die"} "${dev.keyFile} is unavailable"
+               echo " - failing back to interactive password prompt"
+               do_open_passphrase
+            fi
        fi
        '' else ''
-        do_open_passphrase
+           if ! try_empty_passphrase; then
+              do_open_passphrase
+           fi
        ''}
    }

@ -476,6 +504,7 @@ let
  preLVM = filterAttrs (n: v: v.preLVM) luks.devices;
  postLVM = filterAttrs (n: v: !v.preLVM) luks.devices;

+
  stage1Crypttab = pkgs.writeText "initrd-crypttab" (lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: let
    opts = v.crypttabExtraOpts
      ++ optional v.allowDiscards "discard"
@ -483,6 +512,8 @@ let
      ++ optional (v.header != null) "header=${v.header}"
      ++ optional (v.keyFileOffset != null) "keyfile-offset=${toString v.keyFileOffset}"
      ++ optional (v.keyFileSize != null) "keyfile-size=${toString v.keyFileSize}"
+      ++ optional (v.keyFileTimeout != null) "keyfile-timeout=${builtins.toString v.keyFileTimeout}s"
+      ++ optional (v.tryEmptyPassphrase) "try-empty-password=true"
    ;
  in "${n} ${v.device} ${if v.keyFile == null then "-" else v.keyFile} ${lib.concatStringsSep "," opts}") luks.devices));

@ -594,6 +625,25 @@ in
            '';
          };

+          tryEmptyPassphrase = mkOption {
+            default = false;
+            type = types.bool;
+            description = lib.mdDoc ''
+              If keyFile fails then try an empty passphrase first before
+              prompting for password.
+            '';
+          };
+
+          keyFileTimeout = mkOption {
+            default = null;
+            example = 5;
+            type = types.nullOr types.int;
+            description = lib.mdDoc ''
+              The amount of time in seconds for a keyFile to appear before
+              timing out and trying passwords.
+            '';
+          };
+
          keyFileSize = mkOption {
            default = null;
            example = 4096;
@ -889,6 +939,10 @@ in
          message = "boot.initrd.luks.devices.<name>.bypassWorkqueues is not supported for kernels older than 5.9";
        }

+        { assertion = !config.boot.initrd.systemd.enable -> all (x: x.keyFileTimeout == null) (attrValues luks.devices);
+          message = "boot.initrd.luks.devices.<name>.keyFileTimeout is only supported for systemd initrd";
+        }
+
        { assertion = config.boot.initrd.systemd.enable -> all (dev: !dev.fallbackToPassword) (attrValues luks.devices);
          message = "boot.initrd.luks.devices.<name>.fallbackToPassword is implied by systemd stage 1.";
        }
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@ -221,6 +221,8 @@ in {
  fenics = handleTest ./fenics.nix {};
  ferm = handleTest ./ferm.nix {};
  firefox = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox; };
+  firefox-beta = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-beta; };
+  firefox-devedition = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-devedition; };
  firefox-esr    = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr; }; # used in `tested` job
  firefox-esr-102 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-102; };
  firejail = handleTest ./firejail.nix {};
@ -311,6 +313,7 @@ in {
  influxdb = handleTest ./influxdb.nix {};
  initrd-network-openvpn = handleTest ./initrd-network-openvpn {};
  initrd-network-ssh = handleTest ./initrd-network-ssh {};
+  initrd-luks-empty-passphrase = handleTest ./initrd-luks-empty-passphrase.nix {};
  initrdNetwork = handleTest ./initrd-network.nix {};
  initrd-secrets = handleTest ./initrd-secrets.nix {};
  initrd-secrets-changing = handleTest ./initrd-secrets-changing.nix {};
@ -662,6 +665,7 @@ in {
  systemd-initrd-btrfs-raid = handleTest ./systemd-initrd-btrfs-raid.nix {};
  systemd-initrd-luks-fido2 = handleTest ./systemd-initrd-luks-fido2.nix {};
  systemd-initrd-luks-keyfile = handleTest ./systemd-initrd-luks-keyfile.nix {};
+  systemd-initrd-luks-empty-passphrase = handleTest ./initrd-luks-empty-passphrase.nix { systemdStage1 = true; };
  systemd-initrd-luks-password = handleTest ./systemd-initrd-luks-password.nix {};
  systemd-initrd-luks-tpm2 = handleTest ./systemd-initrd-luks-tpm2.nix {};
  systemd-initrd-modprobe = handleTest ./systemd-initrd-modprobe.nix {};
--- a/nixos/tests/initrd-luks-empty-passphrase.nix
+++ b/nixos/tests/initrd-luks-empty-passphrase.nix
@ -0,0 +1,97 @@
+{ system ? builtins.currentSystem
+, config ? {}
+, pkgs ? import ../.. {inherit system config; }
+, systemdStage1 ? false }:
+import ./make-test-python.nix ({ lib, pkgs, ... }: let
+
+  keyfile = pkgs.writeText "luks-keyfile" ''
+    MIGHAoGBAJ4rGTSo/ldyjQypd0kuS7k2OSsmQYzMH6TNj3nQ/vIUjDn7fqa3slt2
+    gV6EK3TmTbGc4tzC1v4SWx2m+2Bjdtn4Fs4wiBwn1lbRdC6i5ZYCqasTWIntWn+6
+    FllUkMD5oqjOR/YcboxG8Z3B5sJuvTP9llsF+gnuveWih9dpbBr7AgEC
+  '';
+
+in {
+  name = "initrd-luks-empty-passphrase";
+
+  nodes.machine = { pkgs, ... }: {
+    virtualisation = {
+      emptyDiskImages = [ 512 ];
+      useBootLoader = true;
+      useEFIBoot = true;
+    };
+
+    boot.loader.systemd-boot.enable = true;
+    boot.initrd.systemd = lib.mkIf systemdStage1 {
+      enable = true;
+      emergencyAccess = true;
+    };
+    environment.systemPackages = with pkgs; [ cryptsetup ];
+
+    specialisation.boot-luks-wrong-keyfile.configuration = {
+      boot.initrd.luks.devices = lib.mkVMOverride {
+        cryptroot = {
+          device = "/dev/vdc";
+          keyFile = "/etc/cryptroot.key";
+          tryEmptyPassphrase = true;
+          fallbackToPassword = !systemdStage1;
+        };
+      };
+      virtualisation.bootDevice = "/dev/mapper/cryptroot";
+      boot.initrd.secrets."/etc/cryptroot.key" = keyfile;
+    };
+
+    specialisation.boot-luks-missing-keyfile.configuration = {
+      boot.initrd.luks.devices = lib.mkVMOverride {
+        cryptroot = {
+          device = "/dev/vdc";
+          keyFile = "/etc/cryptroot.key";
+          tryEmptyPassphrase = true;
+          fallbackToPassword = !systemdStage1;
+        };
+      };
+      virtualisation.bootDevice = "/dev/mapper/cryptroot";
+    };
+  };
+
+  testScript = ''
+    # Encrypt key with empty key so boot should try keyfile and then fallback to empty passphrase
+
+
+    def grub_select_boot_luks_wrong_key_file():
+        """
+        Selects "boot-luks" from the GRUB menu
+        to trigger a login request.
+        """
+        machine.send_monitor_command("sendkey down")
+        machine.send_monitor_command("sendkey down")
+        machine.send_monitor_command("sendkey ret")
+
+    def grub_select_boot_luks_missing_key_file():
+        """
+        Selects "boot-luks" from the GRUB menu
+        to trigger a login request.
+        """
+        machine.send_monitor_command("sendkey down")
+        machine.send_monitor_command("sendkey ret")
+
+    # Create encrypted volume
+    machine.wait_for_unit("multi-user.target")
+    machine.succeed("echo "" | cryptsetup luksFormat /dev/vdc --batch-mode")
+    machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks-wrong-keyfile.conf")
+    machine.succeed("sync")
+    machine.crash()
+
+    # Check if rootfs is on /dev/mapper/cryptroot
+    machine.wait_for_unit("multi-user.target")
+    assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount")
+
+    # Choose boot-luks-missing-keyfile specialisation
+    machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks-missing-keyfile.conf")
+    machine.succeed("sync")
+    machine.crash()
+
+    # Check if rootfs is on /dev/mapper/cryptroot
+    machine.wait_for_unit("multi-user.target")
+    assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount")
+  '';
+})
--- a/pkgs/applications/audio/carla/default.nix
+++ b/pkgs/applications/audio/carla/default.nix
@ -26,13 +26,13 @@ assert withQt -> wrapQtAppsHook != null;

 stdenv.mkDerivation rec {
  pname = "carla";
-  version = "2.5.3";
+  version = "2.5.4";

  src = fetchFromGitHub {
    owner = "falkTX";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-J0C3GLdlLMkm3LHl6l3OI2rA73A6z5MMcNJ1I1T0pbI=";
+    hash = "sha256-St0+avF9/UzQj8T1eZq5HSmxnaK9+BXSuufyX0NJYbU=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/audio/lsp-plugins/default.nix
+++ b/pkgs/applications/audio/lsp-plugins/default.nix
@ -5,11 +5,11 @@

 stdenv.mkDerivation rec {
  pname = "lsp-plugins";
-  version = "1.2.5";
+  version = "1.2.6";

  src = fetchurl {
    url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz";
-    sha256 = "sha256-YYrt+FbpY7iEui0aw4Ce94BW1SHDk0OH8gFSzkW2fkw=";
+    sha256 = "sha256-lNrIsXW3ZNKMFwsl5qowWqK/ZaCaQUAlrSscnsOxvVg=";
  };

  outputs = [ "out" "dev" "doc" ];
@ -19,6 +19,8 @@ stdenv.mkDerivation rec {

  makeFlags = [
    "PREFIX=${placeholder "out"}"
+    "ETCDIR=${placeholder "out"}/etc"
+    "SHAREDDIR=${placeholder "out"}/share"
  ];

  env.NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL";
@ -34,138 +36,58 @@ stdenv.mkDerivation rec {
  meta = with lib;
    { description = "Collection of open-source audio plugins";
      longDescription = ''
-        Compatible with follwing formats:
+        Compatible with the following formats:

+        - CLAP - set of plugins for Clever Audio Plugins API
        - LADSPA - set of plugins for Linux Audio Developer's Simple Plugin API
        - LV2 - set of plugins and UIs for Linux Audio Developer's Simple Plugin API (LADSPA) version 2
        - LinuxVST - set of plugins and UIs for Steinberg's VST 2.4 format ported on GNU/Linux Platform
        - JACK - Standalone versions for JACK Audio connection Kit with UI

-        Contains the following plugins:
+        Contains the following plugins (https://lsp-plug.in/?page=plugins)

-        - Limiter Mono - Begrenzer Mono
-        - Limiter Stereo - Begrenzer Stereo
-        - Dynamic Processor LeftRight - Dynamikprozessor LeftRight
-        - Dynamic Processor MidSide - Dynamikprozessor MidSide
-        - Dynamic Processor Mono - Dynamikprozessor Mono
-        - Dynamic Processor Stereo - Dynamikprozessor Stereo
-        - Expander LeftRight - Expander LeftRight
-        - Expander MidSide - Expander MidSide
-        - Expander Mono - Expander Mono
-        - Expander Stereo - Expander Stereo
-        - Crossover LeftRight x8 - Frequenzweiche LeftRight x8
-        - Crossover MidSide x8 - Frequenzweiche MidSide x8
-        - Crossover Mono x8 - Frequenzweiche Mono x8
-        - Crossover Stereo x8 - Frequenzweiche Stereo x8
-        - Gate LeftRight - Gate LeftRight
-        - Gate MidSide - Gate MidSide
-        - Gate Mono - Gate Mono
-        - Gate Stereo - Gate Stereo
-        - Graphic Equalizer x16 LeftRight - Grafischer Entzerrer x16 LeftRight
-        - Graphic Equalizer x16 MidSide - Grafischer Entzerrer x16 MidSide
-        - Graphic Equalizer x16 Mono - Grafischer Entzerrer x16 Mono
-        - Graphic Equalizer x16 Stereo - Grafischer Entzerrer x16 Stereo
-        - Graphic Equalizer x32 LeftRight - Grafischer Entzerrer x32 LeftRight
-        - Graphic Equalizer x32 MidSide - Grafischer Entzerrer x32 MidSide
-        - Graphic Equalizer x32 Mono - Grafischer Entzerrer x32 Mono
-        - Graphic Equalizer x32 Stereo - Grafischer Entzerrer x32 Stereo
-        - Impulse Responses Mono - Impulsantworten Mono
-        - Impulse Responses Stereo - Impulsantworten Stereo
-        - Impulse Reverb Mono - Impulsnachhall Mono
-        - Impulse Reverb Stereo - Impulsnachhall Stereo
-        - Sampler Mono - Klangerzeuger Mono
-        - Sampler Stereo - Klangerzeuger Stereo
-        - Compressor LeftRight - Kompressor LeftRight
-        - Compressor MidSide - Kompressor MidSide
-        - Compressor Mono - Kompressor Mono
-        - Compressor Stereo - Kompressor Stereo
-        - Artistic Delay Mono - Künstlerische Verzögerung
-        - Artistic Delay Stereo - Künstlerische Verzögerung
-        - Latency Meter - Latenzmessgerät
-        - Loudness Compensator Mono - Lautstärke Kompensator Mono
-        - Loudness Compensator Stereo - Lautstärke Kompensator Stereo
-        - Multiband Expander LeftRight x8 - Multi-band Expander LeftRight x8
-        - Multiband Expander MidSide x8 - Multi-band Expander MidSide x8
-        - Multiband Expander Mono x8 - Multi-band Expander Mono x8
-        - Multiband Expander Stereo x8 - Multi-band Expander Stereo x8
-        - Multiband Gate LeftRight x8 - Multi-band Gate LeftRight x8
-        - Multiband Gate MidSide x8 - Multi-band Gate MidSide x8
-        - Multiband Gate Mono x8 - Multi-band Gate Mono x8
-        - Multiband Gate Stereo x8 - Multi-band Gate Stereo x8
-        - Multiband Compressor LeftRight x8 - Multi-band Kompressor LeftRight x8
-        - Multiband Compressor MidSide x8 - Multi-band Kompressor MidSide x8
-        - Multiband Compressor Mono x8 - Multi-band Kompressor Mono x8
-        - Multiband Compressor Stereo x8 - Multi-band Kompressor Stereo x8
-        - Oscilloscope x1 - Oscilloscope x1
-        - Oscilloscope x2 - Oscilloscope x2
-        - Oscilloscope x4 - Oscilloscope x4
-        - Oscillator Mono - Oszillator Mono
-        - Parametric Equalizer x16 LeftRight - Parametrischer Entzerrer x16 LeftRight
-        - Parametric Equalizer x16 MidSide - Parametrischer Entzerrer x16 MidSide
-        - Parametric Equalizer x16 Mono - Parametrischer Entzerrer x16 Mono
-        - Parametric Equalizer x16 Stereo - Parametrischer Entzerrer x16 Stereo
-        - Parametric Equalizer x32 LeftRight - Parametrischer Entzerrer x32 LeftRight
-        - Parametric Equalizer x32 MidSide - Parametrischer Entzerrer x32 MidSide
-        - Parametric Equalizer x32 Mono - Parametrischer Entzerrer x32 Mono
-        - Parametric Equalizer x32 Stereo - Parametrischer Entzerrer x32 Stereo
-        - Phase Detector - Phasendetektor
-        - Profiler Mono - Profiler Mono
-        - Profiler Stereo - Profiler Stereo
-        - Room Builder Mono - Raumbaumeister Mono
-        - Room Builder Stereo - Raumbaumeister Stereo
-        - Multi-Sampler x12 DirectOut - Schlagzeug x12 Direktausgabe
-        - Multi-Sampler x12 Stereo - Schlagzeug x12 Stereo
-        - Multi-Sampler x24 DirectOut - Schlagzeug x24 Direktausgabe
-        - Multi-Sampler x24 Stereo - Schlagzeug x24 Stereo
-        - Multi-Sampler x48 DirectOut - Schlagzeug x48 Direktausgabe
-        - Multi-Sampler x48 Stereo - Schlagzeug x48 Stereo
-        - Sidechain Multiband Expander LeftRight x8 - Sidechain Multi-band Expander LeftRight x8
-        - Sidechain Multiband Expander MidSide x8 - Sidechain Multi-band Expander MidSide x8
-        - Sidechain Multiband Expander Mono x8 - Sidechain Multi-band Expander Mono x8
-        - Sidechain Multiband Expander Stereo x8 - Sidechain Multi-band Expander Stereo x8
-        - Sidechain Multiband Gate LeftRight x8 - Sidechain Multi-band Gate LeftRight x8
-        - Sidechain Multiband Gate MidSide x8 - Sidechain Multi-band Gate MidSide x8
-        - Sidechain Multiband Gate Mono x8 - Sidechain Multi-band Gate Mono x8
-        - Sidechain Multiband Gate Stereo x8 - Sidechain Multi-band Gate Stereo x8
-        - Sidechain Multiband Compressor LeftRight x8 - Sidechain Multi-band Kompressor LeftRight x8
-        - Sidechain Multiband Compressor MidSide x8 - Sidechain Multi-band Kompressor MidSide x8
-        - Sidechain Multiband Compressor Mono x8 - Sidechain Multi-band Kompressor Mono x8
-        - Sidechain Multiband Compressor Stereo x8 - Sidechain Multi-band Kompressor Stereo x8
-        - Sidechain Limiter Mono - Sidechain-Begrenzer Mono
-        - Sidechain Limiter Stereo - Sidechain-Begrenzer Stereo
-        - Sidechain Dynamic Processor LeftRight - Sidechain-Dynamikprozessor LeftRight
-        - Sidechain Dynamic Processor MidSide - Sidechain-Dynamikprozessor MidSide
-        - Sidechain Dynamic Processor Mono - Sidechain-Dynamikprozessor Mono
-        - Sidechain Dynamic Processor Stereo - Sidechain-Dynamikprozessor Stereo
-        - Sidechain Expander LeftRight - Sidechain-Expander LeftRight
-        - Sidechain Expander MidSide - Sidechain-Expander MidSide
-        - Sidechain Expander Mono - Sidechain-Expander Mono
-        - Sidechain Expander Stereo - Sidechain-Expander Stereo
-        - Sidechain Gate LeftRight - Sidechain-Gate LeftRight
-        - Sidechain Gate MidSide - Sidechain-Gate MidSide
-        - Sidechain Gate Mono - Sidechain-Gate Mono
-        - Sidechain Gate Stereo - Sidechain-Gate Stereo
-        - Sidechain Compressor LeftRight - Sidechain-Kompressor LeftRight
-        - Sidechain Compressor MidSide - Sidechain-Kompressor MidSide
-        - Sidechain Compressor Mono - Sidechain-Kompressor Mono
-        - Sidechain Compressor Stereo - Sidechain-Kompressor Stereo
-        - Slapback Delay Mono - Slapback-Delay Mono
-        - Slapback Delay Stereo - Slapback-Delay Stereo
-        - Spectrum Analyzer x1 - Spektrumanalysator x1
-        - Spectrum Analyzer x12 - Spektrumanalysator x12
-        - Spectrum Analyzer x16 - Spektrumanalysator x16
-        - Spectrum Analyzer x2 - Spektrumanalysator x2
-        - Spectrum Analyzer x4 - Spektrumanalysator x4
-        - Spectrum Analyzer x8 - Spektrumanalysator x8
-        - Surge Filter Mono - Sprungfilter Mono
-        - Surge Filter Stereo - Sprungfilter Stereo
-        - Trigger MIDI Mono - Triggersensor MIDI Mono
-        - Trigger MIDI Stereo - Triggersensor MIDI Stereo
-        - Trigger Mono - Triggersensor Mono
-        - Trigger Stereo - Triggersensor Stereo
-        - Delay Compensator Mono - Verzögerungsausgleicher Mono
-        - Delay Compensator Stereo - Verzögerungsausgleicher Stereo
-        - Delay Compensator x2 Stereo - Verzögerungsausgleicher x2 Stereo
+        Equalizers:
+        - Graphic Equalizer
+        - Parametric Equalizer
+        Dynamic Processing:
+        - Compressor
+        - Dynamic Processor
+        - Expander
+        - Gate
+        - Limiter
+        Multiband Dynamic Processing:
+        - Multiband Compressor
+        - Multiband Dynamic Processor
+        - Multiband Expander
+        - Multiband Gate
+        Convolution / Reverb processing:
+        - Impulse Responses
+        - Impulse Reverb
+        - Room Builder
+        Delay Effects:
+        - Artistic Delay
+        - Compensation Delay
+        - Slap-back Delay
+        Analyzers:
+        - Oscilloscope
+        - Phase Detector
+        - Spectrum Analyzer
+        Multiband Processing:
+        - Crossover
+        Samplers:
+        - Multisampler
+        - Sampler
+        Generators / Oscillators:
+        - Noise Generator
+        - Oscillator
+        Utilitary Plugins:
+        - A/B Test Plugin
+        - Latency Meter
+        - Loudness Compensator
+        - Mixer
+        - Profiler
+        - Surge Filter
+        - Trigger
      '';
      homepage = "https://lsp-plug.in";
      maintainers = with maintainers; [ magnetophon ];
--- a/pkgs/applications/audio/mmlgui/default.nix
+++ b/pkgs/applications/audio/mmlgui/default.nix
@ -15,14 +15,14 @@

 stdenv.mkDerivation rec {
  pname = "mmlgui";
-  version = "unstable-2022-10-13";
+  version = "unstable-2023-03-19";

  src = fetchFromGitHub {
    owner = "superctr";
    repo = "mmlgui";
-    rev = "6b2687504644b481db403f032f463e38bbbb1dca";
+    rev = "59ac28c0008e227c03799cce85b77f96241159b1";
    fetchSubmodules = true;
-    sha256 = "OkYVjdvi8ls01DaIiDEPFXFCUh6g9AEeSlbDFfdPKeo=";
+    sha256 = "0CHRUizhg/WOWhDOsFqRiGu/m/U7xt5du8Uvnl7kxpU=";
  };

  postPatch = ''
--- a/pkgs/applications/audio/musikcube/default.nix
+++ b/pkgs/applications/audio/musikcube/default.nix
@ -32,13 +32,13 @@

 stdenv.mkDerivation rec {
  pname = "musikcube";
-  version = "0.99.5";
+  version = "0.99.6";

  src = fetchFromGitHub {
    owner = "clangen";
    repo = pname;
    rev = version;
-    sha256 = "sha256-SbWL36GRIJPSvxZyj6sebJxTkSPsUcsKyC3TmcIq2O0";
+    sha256 = "sha256-D25P254iaOsS0TyAKAiarDP37D4U9Dw7mdvUin/Qblc=";
  };

  outputs = [ "out" "dev" ];
--- a/pkgs/applications/audio/noisetorch/default.nix
+++ b/pkgs/applications/audio/noisetorch/default.nix
@ -2,21 +2,21 @@

 buildGoModule rec {
  pname = "NoiseTorch";
-  version = "0.12.0";
+  version = "0.12.2";

  src = fetchFromGitHub {
    owner = "noisetorch";
    repo = "NoiseTorch";
    rev = "v${version}";
-    sha256 = "sha256-A6cX1ck47/ZIn9cnV/Ow4CxVFfOX5J0K0Q+B70jCFdQ=";
    fetchSubmodules = true;
+    sha256 = "sha256-gOPSMPH99Upi/30OnAdwSb7SaMV0i/uHB051cclfz6A=";
  };

  vendorHash = null;

  doCheck = false;

-  ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.distribution=nix" ];
+  ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.distribution=nixpkgs" ];

  subPackages = [ "." ];

@ -32,9 +32,6 @@ buildGoModule rec {
  '';

  meta = with lib; {
-    insecure = true;
-    knownVulnerabilities =
-      lib.optional (lib.versionOlder version "0.12") "https://github.com/noisetorch/NoiseTorch/releases/tag/v0.12.0";
    description = "Virtual microphone device with noise supression for PulseAudio";
    homepage = "https://github.com/noisetorch/NoiseTorch";
    license = licenses.gpl3Plus;
--- a/pkgs/applications/audio/nova-filters/default.nix
+++ b/pkgs/applications/audio/nova-filters/default.nix
@ -17,6 +17,7 @@ stdenv.mkDerivation {
    sed -i -e '4d' SConstruct
    sed -i 's@Options@Variables@g' SConstruct
    sed -i "s@-fomit-frame-pointer -ffast-math -mfpmath=sse@-I ${boost.dev}/include@g" SConstruct
+    sed -i "s@env.has_key('cxx')@'cxx' in env@g" SConstruct
    sed -i "s@ladspa.h@${ladspaH}/include/ladspa.h@g" filters.cpp
    sed -i "s@LADSPA_HINT_SAMPLE_RATE, 0, 0.5@LADSPA_HINT_SAMPLE_RATE, 0.0001, 0.5@g" filters.cpp
    sed -i "s/= check/= detail::filter_base<internal_type, checked>::check/" nova/source/dsp/filter.hpp
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@ -5,11 +5,11 @@

 stdenv.mkDerivation rec {
  pname = "snd";
-  version = "23.1";
+  version = "23.2";

  src = fetchurl {
    url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
-    sha256 = "sha256-zNXA/HFUCTxKzeKde/XVK239dInnxkPBmxXrlicl1fI=";
+    sha256 = "sha256-MLBFK34RgpEoK2reA+Ik35pY5YuzetDU1Wz9yAPQhEc=";
  };

  nativeBuildInputs = [ pkg-config ];
--- a/pkgs/applications/audio/sonic-lineup/default.nix
+++ b/pkgs/applications/audio/sonic-lineup/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsa-lib, boost, bzip2, fftw, fftwFloat, libfishsound
+{ lib, stdenv, fetchurl, fetchpatch2, alsa-lib, boost, bzip2, fftw, fftwFloat, libfishsound
 , libid3tag, liblo, libmad, liboggz, libpulseaudio, libsamplerate
 , libsndfile, lrdf, opusfile, portaudio, rubberband, serd, sord, capnproto
 , wrapQtAppsHook, pkg-config
@ -14,6 +14,16 @@ stdenv.mkDerivation rec {
    sha256 = "0k45k9fawcm4s5yy05x00pgww7j8m7k2cxcc7g0fn9vqy7vcbq9h";
  };

+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/sonic-visualiser/svcore/commit/5a7b517e43b7f0b3f03b7fc3145102cf4e5b0ffc.patch";
+      stripLen = 1;
+      extraPrefix = "svcore/";
+      sha256 = "sha256-DOCdQqCihkR0g/6m90DbJxw00QTpyVmFzCxagrVWKiI=";
+    })
+    ./match-vamp.patch
+  ];
+
  buildInputs =
    [ alsa-lib boost bzip2 fftw fftwFloat libfishsound libid3tag liblo
      libmad liboggz libpulseaudio libsamplerate libsndfile lrdf opusfile
@ -36,7 +46,5 @@ stdenv.mkDerivation rec {
    license = licenses.gpl2Plus;
    maintainers = [ maintainers.vandenoever ];
    platforms = platforms.linux;
-    # undefined reference to `std::__throw_bad_array_new_length()@GLIBCXX_3.4.29'
-    broken = true; # at 2022-09-30
  };
 }
--- a/pkgs/applications/audio/sonic-lineup/match-vamp.patch
+++ b/pkgs/applications/audio/sonic-lineup/match-vamp.patch
@ -0,0 +1,11 @@
+--- a/match/src/FullDTW.h
+++ b/match/src/FullDTW.h
+@@ -83,7 +83,7 @@
+      * against the best-matching subsequence of s1; otherwise it is
+      * against the whole of s1.
+      */
+-    std::vector<size_t> align(const featureseq_t &s1,
+    std::vector<std::size_t> align(const featureseq_t &s1,
+                               const featureseq_t &s2);
+ 
+ private:
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@ -32,6 +32,12 @@ in mkDerivation {
      url = "https://github.com/sddm/sddm/commit/e93bf95c54ad8c2a1604f8d7be05339164b19308.patch";
      sha256 = "sha256:1rh6sdvzivjcl5b05fczarvxhgpjhi7019hvf2gadnwgwdg104r4";
    })
+    # Fix fails to start while starting X server
+    # See: https://github.com/sddm/sddm/pull/1324
+    (fetchpatch {
+      url = "https://github.com/sddm/sddm/commit/adfaa222fdfa6115ea2b320b0bbc2126db9270a5.patch";
+      sha256 = "sha256-q/YLlAjxluzHMKUUQglLo3RyyhERQGPHXGr56+4R9VU=";
+    })
  ];

  postPatch =
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@ -38,13 +38,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "cudatext";
-  version = "1.187.1";
+  version = "1.188.0";

  src = fetchFromGitHub {
    owner = "Alexey-T";
    repo = "CudaText";
    rev = version;
-    hash = "sha256-OdeiJ+g2woNjjQI5z3TDSi9Tt8kOheUrd/Gak+fmXX0=";
+    hash = "sha256-h5lbZ7H9a24OQvisBcmHe5RfaXTz2/LX3b4x6ArraYQ=";
  };

  postPatch = ''
--- a/pkgs/applications/editors/cudatext/deps.json
+++ b/pkgs/applications/editors/cudatext/deps.json
@ -11,13 +11,13 @@
  },
  "ATFlatControls": {
    "owner": "Alexey-T",
-    "rev": "2023.03.10",
-    "hash": "sha256-RHNWJN+P3w67UupeikHn6GrWZCOSoGCrP7BYG7myx+A="
+    "rev": "2023.03.22",
+    "hash": "sha256-cUuoB9hPA04MmurtCbzkMuozc79Dj0rRnqE0ms2jJGs="
  },
  "ATSynEdit": {
    "owner": "Alexey-T",
-    "rev": "2023.03.14",
-    "hash": "sha256-mrjMG0t10lOd9hOEGBt9iGlpGdHcgbEVRcezyuUOqPQ="
+    "rev": "2023.03.22",
+    "hash": "sha256-IoucMftNzDSOU3R6vyWTjfM9UVJrUSiHe5Kt1Ax05fg="
  },
  "ATSynEdit_Cmp": {
    "owner": "Alexey-T",
@ -26,8 +26,8 @@
  },
  "EControl": {
    "owner": "Alexey-T",
-    "rev": "2023.02.25",
-    "hash": "sha256-09jTp0pFbiQ268xB/eDUj98t8WYjzGaTiHdFvWlmoR0="
+    "rev": "2023.03.06",
+    "hash": "sha256-JQURgyFfzKL8RC2wJmubFrXmpCeGWDkz1jXl4wBwhJ8="
  },
  "ATSynEdit_Ex": {
    "owner": "Alexey-T",
--- a/pkgs/applications/editors/jetbrains/versions.json
+++ b/pkgs/applications/editors/jetbrains/versions.json
@ -3,10 +3,10 @@
    "clion": {
      "update-channel": "CLion RELEASE",
      "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
-      "version": "2022.3.2",
-      "sha256": "896e9cc5b908aa51e091201c320f6f08033f9064382e44b107fccc554ed94895",
-      "url": "https://download.jetbrains.com/cpp/CLion-2022.3.2.tar.gz",
-      "build_number": "223.8617.54"
+      "version": "2022.3.3",
+      "sha256": "1b46ff0791bcb38ecb39c5f4a99941f99ed73d4f6d924a2042fdb55afc5fc03d",
+      "url": "https://download.jetbrains.com/cpp/CLion-2022.3.3.tar.gz",
+      "build_number": "223.8836.42"
    },
    "datagrip": {
      "update-channel": "DataGrip RELEASE",
@ -27,26 +27,26 @@
    "goland": {
      "update-channel": "GoLand RELEASE",
      "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
-      "version": "2022.3.2",
-      "sha256": "f130d0e4c2c89dcd291e05cca33484eb08e247e9ec29c13deaf67176afbf6a36",
-      "url": "https://download.jetbrains.com/go/goland-2022.3.2.tar.gz",
-      "build_number": "223.8617.58"
+      "version": "2022.3.3",
+      "sha256": "8c85b56b4e226739a0e36549f5f80fed4cbf2b2798eff442499f5779396a6917",
+      "url": "https://download.jetbrains.com/go/goland-2022.3.3.tar.gz",
+      "build_number": "223.8836.34"
    },
    "idea-community": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
-      "version": "2022.3.2",
-      "sha256": "02bc35281eb4e1285eeb9d797ec2b31ec7370e320ad0e89f6f1fa704d78ec4bf",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.2.tar.gz",
-      "build_number": "223.8617.56"
+      "version": "2022.3.3",
+      "sha256": "699492fb5a9de750250fdaadca5fc9212114ee445a50875b59bbc99f0187c2e4",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.3.tar.gz",
+      "build_number": "223.8836.41"
    },
    "idea-ultimate": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
-      "version": "2022.3.2",
-      "sha256": "6fa3aff1c730bb79bf3e2e29edcce6d4cdbccfa631524c6253de518be6b6f3d2",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.2.tar.gz",
-      "build_number": "223.8617.56"
+      "version": "2022.3.3",
+      "sha256": "c302bd84b48a56ef1b0f033e8e93a0da5590f80482eae172db6130da035314a6",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.3.tar.gz",
+      "build_number": "223.8836.41"
    },
    "mps": {
      "update-channel": "MPS RELEASE",
@ -59,61 +59,61 @@
    "phpstorm": {
      "update-channel": "PhpStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
-      "version": "2022.3.2",
-      "sha256": "7592d18fa1e199087cfd661b64c2fad717840f8ff3e3faf4d88db58bdb397e03",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.2.tar.gz",
-      "build_number": "223.8617.59",
+      "version": "2022.3.3",
+      "sha256": "d79a66032dfb85b16cef4ff308eb0161e06a831cee1fa93f2b7ca46fb1dc2ea9",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.3.tar.gz",
+      "build_number": "223.8836.42",
      "version-major-minor": "2022.3"
    },
    "pycharm-community": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
-      "version": "2022.3.2",
-      "sha256": "0ae72d1931a6effbeb2329f6e5c35859d933798a494479f066ef0a7b2be6b553",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.2.tar.gz",
-      "build_number": "223.8617.48"
+      "version": "2022.3.3",
+      "sha256": "fe84e586ce8da916abf481e02959742a20bab6ba3cdf447370ac8b2d5115211c",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.3.tar.gz",
+      "build_number": "223.8836.43"
    },
    "pycharm-professional": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
-      "version": "2022.3.2",
-      "sha256": "56430090dd471e106fdc48463027d89de624759f8757248ced9776978854e4f6",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.2.tar.gz",
-      "build_number": "223.8617.48"
+      "version": "2022.3.3",
+      "sha256": "50c37aafd9fbe3a78d97cccf4f7abd80266c548d1c7ea4751b08c52810f16f2d",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.3.tar.gz",
+      "build_number": "223.8836.43"
    },
    "rider": {
      "update-channel": "Rider RELEASE",
      "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
-      "version": "2022.3.2",
-      "sha256": "ad853b75bc1e1379593bece3a5fbecec21d1de30263d0d5fef067a352b7d27ef",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2.tar.gz",
-      "build_number": "223.8617.53"
+      "version": "2022.3.3",
+      "sha256": "e4607ae70bd0acf827535aa329e3da73ddf3a3fa78b54b5c8d18eae6ef52919c",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.3.tar.gz",
+      "build_number": "223.8836.53"
    },
    "ruby-mine": {
      "update-channel": "RubyMine RELEASE",
      "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
-      "version": "2022.3.2",
-      "sha256": "8c803914c55a3c1801ff9b619870d81597fabedbfb08a7c1aecf24f5d0884aea",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.2.tar.gz",
-      "build_number": "223.8617.48"
+      "version": "2022.3.3",
+      "sha256": "18dec5191b07a455d3c3dcb0bcc146fbe83ebb411addaf89e895d373728d932e",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.3.tar.gz",
+      "build_number": "223.8836.42"
    },
    "webstorm": {
      "update-channel": "WebStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
-      "version": "2022.3.2",
-      "sha256": "2b612177c99ff0c6c542abe005846c3aa6cf170faa0202daafeb4ab1627c3794",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.2.tar.gz",
-      "build_number": "223.8617.44"
+      "version": "2022.3.4",
+      "sha256": "c33f72b5e26f347983b7bae92608d9b4343dcbb400736addb0793407aedc3260",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.4.tar.gz",
+      "build_number": "223.8836.50"
    }
  },
  "x86_64-darwin": {
    "clion": {
      "update-channel": "CLion RELEASE",
      "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
-      "version": "2022.3.2",
-      "sha256": "482461646f61f355c7fd976e655bf77dadfa545483c6ab47352ff22eb1193e33",
-      "url": "https://download.jetbrains.com/cpp/CLion-2022.3.2.dmg",
-      "build_number": "223.8617.54"
+      "version": "2022.3.3",
+      "sha256": "d07ecaf7e3950cbbc445b59049a40b018a07e0f7031169b28acb185d74b1b20c",
+      "url": "https://download.jetbrains.com/cpp/CLion-2022.3.3.dmg",
+      "build_number": "223.8836.42"
    },
    "datagrip": {
      "update-channel": "DataGrip RELEASE",
@ -134,26 +134,26 @@
    "goland": {
      "update-channel": "GoLand RELEASE",
      "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
-      "version": "2022.3.2",
-      "sha256": "8e12ae0ee0d88cd716ac76a8a49392a51236287984d84c19324a19758fe8fc03",
-      "url": "https://download.jetbrains.com/go/goland-2022.3.2.dmg",
-      "build_number": "223.8617.58"
+      "version": "2022.3.3",
+      "sha256": "70d98ed21d52f7cabd4a1f8a1153388e8675220118eed9c767a82172b2dc2453",
+      "url": "https://download.jetbrains.com/go/goland-2022.3.3.dmg",
+      "build_number": "223.8836.34"
    },
    "idea-community": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
-      "version": "2022.3.2",
-      "sha256": "14b3f587e868adfb132791e17e3b1978a2fb5fd55447eae589c4d95d70c9ace7",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.2.dmg",
-      "build_number": "223.8617.56"
+      "version": "2022.3.3",
+      "sha256": "7837002f5998d683ab547e2548e1ac863b359d20a935c11ff0a27d858e64a522",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.3.dmg",
+      "build_number": "223.8836.41"
    },
    "idea-ultimate": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
-      "version": "2022.3.2",
-      "sha256": "54d51ba7b65f84545faa7f8fc001b2bce48ef3ddb76006a44de9e95c6b395b8c",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.2.dmg",
-      "build_number": "223.8617.56"
+      "version": "2022.3.3",
+      "sha256": "500b38341a13f2365b0052fadc91f83431db27c223036458171298a3bdd4b8b9",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.3.dmg",
+      "build_number": "223.8836.41"
    },
    "mps": {
      "update-channel": "MPS RELEASE",
@ -166,61 +166,61 @@
    "phpstorm": {
      "update-channel": "PhpStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
-      "version": "2022.3.2",
-      "sha256": "a2833c575cfa17c8d30a5f2e0d4ff06167372e7d8190ff08fc2f14e57a21396c",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.2.dmg",
-      "build_number": "223.8617.59",
+      "version": "2022.3.3",
+      "sha256": "79f5857f95452a6f66ba4ddbfd4445290449f21b90e6fd37e6118ac17cc052ed",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.3.dmg",
+      "build_number": "223.8836.42",
      "version-major-minor": "2022.3"
    },
    "pycharm-community": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
-      "version": "2022.3.2",
-      "sha256": "0a5a396b71533ab7ec77b2f10e08a20a970ac5712cfeb3378728020ec84be416",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.2.dmg",
-      "build_number": "223.8617.48"
+      "version": "2022.3.3",
+      "sha256": "2681947868b6f64a9b528fb2083347cd15f1094f1e880a25eaa1c96eb7a1406f",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.3.dmg",
+      "build_number": "223.8836.43"
    },
    "pycharm-professional": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
-      "version": "2022.3.2",
-      "sha256": "6537fe033c13fb9b06da7583c875b0dc5f20660e5b349edc39bd8fdddffaf0f3",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.2.dmg",
-      "build_number": "223.8617.48"
+      "version": "2022.3.3",
+      "sha256": "290ab690c193563e0b2afc88e9d01feca319e2bc366a3677c8870ac8ba8d7e6f",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.3.dmg",
+      "build_number": "223.8836.43"
    },
    "rider": {
      "update-channel": "Rider RELEASE",
      "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
-      "version": "2022.3.2",
-      "sha256": "896dadb76b44bacef79b31619719107f8cf0e729331bda2d6b9f80e8be6dea92",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2.dmg",
-      "build_number": "223.8617.53"
+      "version": "2022.3.3",
+      "sha256": "e06189d3170b7005540de82ad4288111007c1231f15598ee9baa392004d31dae",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.3.dmg",
+      "build_number": "223.8836.53"
    },
    "ruby-mine": {
      "update-channel": "RubyMine RELEASE",
      "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
-      "version": "2022.3.2",
-      "sha256": "bea0a86a4ca00c08d78ccca7568ad5170798544c4a64b21bbfede126bdff0a99",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.2.dmg",
-      "build_number": "223.8617.48"
+      "version": "2022.3.3",
+      "sha256": "f6583f4c9b9cb3fb1079968565c3f65f6a05329724e1dbb5c29ac348fc86cd9d",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.3.dmg",
+      "build_number": "223.8836.42"
    },
    "webstorm": {
      "update-channel": "WebStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
-      "version": "2022.3.2",
-      "sha256": "87e716107156d15aa68230369b6eab2d25c5f6134cfe38cdb01e5b10f2a24418",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.2.dmg",
-      "build_number": "223.8617.44"
+      "version": "2022.3.4",
+      "sha256": "9146df417dcddaab5a58e1b9495c0b3d1e6c81ad9d61d354e54cbd24ba254351",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.4.dmg",
+      "build_number": "223.8836.50"
    }
  },
  "aarch64-darwin": {
    "clion": {
      "update-channel": "CLion RELEASE",
      "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
-      "version": "2022.3.2",
-      "sha256": "0d3d8ccce520a26781a2d126b887d5a829e97987b728104203528510ff9a4423",
-      "url": "https://download.jetbrains.com/cpp/CLion-2022.3.2-aarch64.dmg",
-      "build_number": "223.8617.54"
+      "version": "2022.3.3",
+      "sha256": "c271f9c704626a14381e6fd8f99b2cd5a370545c660e059b8afd677c8558dd7b",
+      "url": "https://download.jetbrains.com/cpp/CLion-2022.3.3-aarch64.dmg",
+      "build_number": "223.8836.42"
    },
    "datagrip": {
      "update-channel": "DataGrip RELEASE",
@ -241,26 +241,26 @@
    "goland": {
      "update-channel": "GoLand RELEASE",
      "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
-      "version": "2022.3.2",
-      "sha256": "1df4707686f88e284e15a7fd63945b476dabf8e5a041894c281aba4838c603d9",
-      "url": "https://download.jetbrains.com/go/goland-2022.3.2-aarch64.dmg",
-      "build_number": "223.8617.58"
+      "version": "2022.3.3",
+      "sha256": "6414ffacecbdc5f02c5ad30a4ba710c8a9b59753eb27376b0df9856696d7ee5f",
+      "url": "https://download.jetbrains.com/go/goland-2022.3.3-aarch64.dmg",
+      "build_number": "223.8836.34"
    },
    "idea-community": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
-      "version": "2022.3.2",
-      "sha256": "808fa52e8dceacb8beb6b84705ac44ded04b67d07c1310449d7cd5c7afbdea46",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.2-aarch64.dmg",
-      "build_number": "223.8617.56"
+      "version": "2022.3.3",
+      "sha256": "f7c98311b8520050f15f8ffb169a8a0f511958f4e4d39eff3891bc62c5d16920",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.3-aarch64.dmg",
+      "build_number": "223.8836.41"
    },
    "idea-ultimate": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
-      "version": "2022.3.2",
-      "sha256": "ea6da172fc8f27b7bad5475f0e1fc3359c492885bba8b6de59be727cb7b65284",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.2-aarch64.dmg",
-      "build_number": "223.8617.56"
+      "version": "2022.3.3",
+      "sha256": "627fdf0818f829ffa3c63275d51128ca23f27bca9945508e4743716856329043",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.3-aarch64.dmg",
+      "build_number": "223.8836.41"
    },
    "mps": {
      "update-channel": "MPS RELEASE",
@ -273,51 +273,51 @@
    "phpstorm": {
      "update-channel": "PhpStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
-      "version": "2022.3.2",
-      "sha256": "4e1244d7fa459a7f07ec43725ed4271e2c669c3202cc04cc074f11fb07bbb25e",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.2-aarch64.dmg",
-      "build_number": "223.8617.59",
+      "version": "2022.3.3",
+      "sha256": "23ba3a7ff84216b945327241be759429040bd09bc4269a01b77a2e3745c66132",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.3-aarch64.dmg",
+      "build_number": "223.8836.42",
      "version-major-minor": "2022.3"
    },
    "pycharm-community": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
-      "version": "2022.3.2",
-      "sha256": "5a0fcb9fdc94896cd5651d9d60fa708596aebe374bc35944b3ff6133f4eb5aae",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.2-aarch64.dmg",
-      "build_number": "223.8617.48"
+      "version": "2022.3.3",
+      "sha256": "270388941ad525c5a96e885b3450a345e34ec82c2360c82554aa1d3537bc0fd9",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.3-aarch64.dmg",
+      "build_number": "223.8836.43"
    },
    "pycharm-professional": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
-      "version": "2022.3.2",
-      "sha256": "3237e19f920880a92712d7a61df5eadd6b8e1652cf97115078289468e17332a4",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.2-aarch64.dmg",
-      "build_number": "223.8617.48"
+      "version": "2022.3.3",
+      "sha256": "d53b7ea764cd89cea81ebefe630a151627d4d71657868bd35296fd994524105a",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.3-aarch64.dmg",
+      "build_number": "223.8836.43"
    },
    "rider": {
      "update-channel": "Rider RELEASE",
      "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
-      "version": "2022.3.2",
-      "sha256": "a680b91d6c909f913317c91b1912b1b822c121d14d78962f7f44f7473e54b5a2",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2-aarch64.dmg",
-      "build_number": "223.8617.53"
+      "version": "2022.3.3",
+      "sha256": "5284412be4fc781047dda6d0af7bf6bebbc051e6c67bd2cf228ffee83d2d4ccb",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.3-aarch64.dmg",
+      "build_number": "223.8836.53"
    },
    "ruby-mine": {
      "update-channel": "RubyMine RELEASE",
      "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
-      "version": "2022.3.2",
-      "sha256": "346b990c412f272acc2fc7e87448f456d8d6a1978b7a94eb645f9cea806b083c",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.2-aarch64.dmg",
-      "build_number": "223.8617.48"
+      "version": "2022.3.3",
+      "sha256": "317c9bd172cf7484d57781fafe8d317f6e1478141bbe30ac364aaa48a0cdc692",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.3-aarch64.dmg",
+      "build_number": "223.8836.42"
    },
    "webstorm": {
      "update-channel": "WebStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
-      "version": "2022.3.2",
-      "sha256": "a869cd1c1c7b01bbd98f9a1cfd08b1b18ebe77f1c4422ee7e11ddc2c3cb250ce",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.2-aarch64.dmg",
-      "build_number": "223.8617.44"
+      "version": "2022.3.4",
+      "sha256": "66020aa7607eb31c2b1f278f7999078d2bfe74bac0f84f86ad8f51cf4c1e4415",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.4-aarch64.dmg",
+      "build_number": "223.8836.50"
    }
  }
 }
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -5,6 +5,7 @@
 , buildGoModule
 , buildVimPluginFrom2Nix
 , fetchFromGitHub
+, fetchFromSourcehut
 , fetchpatch
 , fetchurl
 , substituteAll
@ -496,12 +497,13 @@ self: super: {
  });

  himalaya-vim = super.himalaya-vim.overrideAttrs (old: {
-    postPatch = ''
-      substituteInPlace plugin/himalaya.vim \
-        --replace "if !executable('himalaya')" "if v:false"
-      substituteInPlace autoload/himalaya/request.vim \
-        --replace "'himalaya" "'${himalaya}/bin/himalaya"
-    '';
+    buildInputs = [ himalaya ];
+    src = fetchFromSourcehut {
+      owner = "~soywod";
+      repo = "himalaya-vim";
+      rev = "v${himalaya.version}";
+      sha256 = "W+91hnNeS6WkDiR9r1s7xPTK9JlCWiVkI/nXVYbepY0=";
+    };
  });

  jedi-vim = super.jedi-vim.overrideAttrs (old: {
@ -595,6 +597,17 @@ self: super: {
      rev = "5d916c39c1852e09fcd39eab174b8e5bbdb25f8f";
      sha256 = "10d6dh0czdpgfpzqs5vzxfffkm0460qjzi2mfkacgghqf3iwkbja";
    };
+    passthru.python3Dependencies = ps: with ps; [
+      pynvim
+      jupyter-client
+      ueberzug
+      pillow
+      cairosvg
+      plotly
+      ipykernel
+      pyperclip
+      pnglatex
+    ];
    meta.homepage = "https://github.com/WhiteBlackGoose/magma-nvim-goose/";
  };

--- a/pkgs/applications/emulators/rpcs3/default.nix
+++ b/pkgs/applications/emulators/rpcs3/default.nix
@ -9,10 +9,10 @@

 let
  # Keep these separate so the update script can regex them
-  rpcs3GitVersion = "14812-cf5346c26";
-  rpcs3Version = "0.0.27-14812-cf5346c26";
-  rpcs3Revision = "cf5346c263111760752cabb94767c07c501207c4";
-  rpcs3Sha256 = "1dkik6r6khmpcbh27n1bzg7y1ws7ljrkn81a7qn21wmh709sscc8";
+  rpcs3GitVersion = "14824-ad3e740c0";
+  rpcs3Version = "0.0.27-14824-ad3e740c0";
+  rpcs3Revision = "ad3e740c0921c18a832fd4b0401f965a28a58c97";
+  rpcs3Sha256 = "0j9zi45z4xiam8frqs3b9xcjdw2gmqj34p8cv5w7sizr6sj09srp";

  ittapi = fetchFromGitHub {
    owner = "intel";
--- a/pkgs/applications/misc/heimer/default.nix
+++ b/pkgs/applications/misc/heimer/default.nix
@ -8,13 +8,13 @@

 mkDerivation rec {
  pname = "heimer";
-  version = "4.0.0";
+  version = "4.1.0";

  src = fetchFromGitHub {
    owner = "juzzlin";
    repo = pname;
    rev = version;
-    hash = "sha256-sp3iy28Bc+gOvivHA8OPG8vf7otjeaPk6Iy4BhT/SaU=";
+    hash = "sha256-cq8rRz1mfDPzTRVG++vccI2YewSKQqd1RAJbgB3TS5E=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/klayout/default.nix
+++ b/pkgs/applications/misc/klayout/default.nix
@ -5,13 +5,13 @@

 mkDerivation rec {
  pname = "klayout";
-  version = "0.28.5";
+  version = "0.28.6";

  src = fetchFromGitHub {
    owner = "KLayout";
    repo = "klayout";
    rev = "v${version}";
-    hash = "sha256-fjKxQ3oVtnFwzLeeE6kN0jKE5PIfBZubTF54KO+k/DE=";
+    hash = "sha256-Errpn2GHxVncum+6zriM9OrhrCDK8EtD2ZYVYPoyabk=";
  };

  postPatch = ''
--- a/pkgs/applications/misc/ttdl/default.nix
+++ b/pkgs/applications/misc/ttdl/default.nix
@ -5,16 +5,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "ttdl";
-  version = "3.6.5";
+  version = "3.7.0";

  src = fetchFromGitHub {
    owner = "VladimirMarkelov";
    repo = "ttdl";
    rev = "v${version}";
-    sha256 = "sha256-mplV++N+us6IntNJsZoH4yyKZ8eYplUYuVJeac0ZIkQ=";
+    sha256 = "sha256-4XmOFoj2kynQZzos/vf0rciJCGfnFLN7f1MG9NU53os=";
  };

-  cargoHash = "sha256-mgvMQjScXCmr3HIQtGJ2YWRUhiSP5resL96LUCe8D+c=";
+  cargoHash = "sha256-9TyEHAlxTNx/ildlqEjuFIKfmUQQFQSVoxcrb2Tg9Ps=";

  meta = with lib; {
    description = "A CLI tool to manage todo lists in todo.txt format";
--- a/pkgs/applications/misc/veracrypt/default.nix
+++ b/pkgs/applications/misc/veracrypt/default.nix
@ -12,6 +12,7 @@
 , exfat
 , ntfs3g
 , btrfs-progs
+, wrapGAppsHook
 }:

 stdenv.mkDerivation rec {
@ -37,7 +38,7 @@ stdenv.mkDerivation rec {

  sourceRoot = "src";

-  nativeBuildInputs = [ makeself pkg-config yasm ];
+  nativeBuildInputs = [ makeself pkg-config yasm wrapGAppsHook ];
  buildInputs = [ fuse lvm2 wxGTK ];

  enableParallelBuilding = true;
--- a/pkgs/applications/networking/asn/default.nix
+++ b/pkgs/applications/networking/asn/default.nix
@ -15,13 +15,13 @@

 stdenv.mkDerivation rec {
  pname = "asn";
-  version = "0.72.1";
+  version = "0.73";

  src = fetchFromGitHub {
    owner = "nitefood";
    repo = "asn";
    rev = "v${version}";
-    sha256 = "sha256-2JGc1PhvmuZFT6c6UcxHKttHqWF+NsekqnYtdGKgU2U=";
+    sha256 = "sha256-z0vjYU6k+6p/lASqOase91aqkUvmuy8sUBjsq2OPnxE=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/applications/networking/browsers/badwolf/default.nix
+++ b/pkgs/applications/networking/browsers/badwolf/default.nix
@ -0,0 +1,38 @@
+{ stdenv
+, lib
+, fetchgit
+, pkg-config
+, wrapGAppsHook
+, webkitgtk
+, libxml2
+, glib
+, glib-networking
+, gettext
+}:
+stdenv.mkDerivation rec {
+  pname = "badwolf";
+  version = "1.2.2";
+
+  src = fetchgit {
+    url = "git://hacktivis.me/git/badwolf.git";
+    rev = "v${version}";
+    hash = "sha256-HfAsq6z+1kqMAsNxJjWJx9nd2cbv0XN4KRS8cYuhOsQ=";
+  };
+
+  preConfigure = ''
+    export PREFIX=$out
+  '';
+
+  nativeBuildInputs = [ pkg-config wrapGAppsHook ];
+
+  buildInputs = [ webkitgtk libxml2 gettext glib glib-networking ];
+
+  meta = with lib; {
+    description = "Minimalist and privacy-oriented WebKitGTK+ browser";
+    homepage = "https://hacktivis.me/projects/badwolf";
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ laalsaas ];
+  };
+
+}
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@ -5,6 +5,7 @@
 , binaryName ? "firefox"
 , application ? "browser"
 , applicationName ? "Mozilla Firefox"
+, branding ? null
 , src
 , unpackPhase ? null
 , extraPatches ? []
@ -390,6 +391,7 @@ buildStdenv.mkDerivation ({
  ]
  ++ lib.optionals enableDebugSymbols [ "--disable-strip" "--disable-install-strip" ]
  ++ lib.optional enableOfficialBranding "--enable-official-branding"
+  ++ lib.optional (branding != null) "--with-branding=${branding}"
  ++ extraConfigureFlags;

  buildInputs = [
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@ -27,6 +27,62 @@ rec {
    };
  };

+  firefox-beta = buildMozillaMach rec {
+    pname = "firefox-beta";
+    version = "112.0b6";
+    applicationName = "Mozilla Firefox Beta";
+    src = fetchurl {
+      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
+      sha512 = "sha512-3Ae3IilmvG7twTaFnKs0TJpiuzLERdrjToTmE644VFeK2GpRgaXgFRfsSB32cyAE+zXPYN/fub8sUoPAHLMbvg==";
+    };
+
+    meta = {
+      description = "A web browser built from Firefox Beta Release source tree";
+      homepage = "http://www.mozilla.com/en-US/firefox/";
+      maintainers = with lib.maintainers; [ jopejoe1 ];
+      platforms = lib.platforms.unix;
+      badPlatforms = lib.platforms.darwin;
+      broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
+                                             # not in `badPlatforms` because cross-compilation on 64-bit machine might work.
+      maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
+      license = lib.licenses.mpl20;
+    };
+    tests = [ nixosTests.firefox-beta ];
+    updateScript = callPackage ./update.nix {
+      attrPath = "firefox-beta-unwrapped";
+      versionSuffix = "b[0-9]*";
+    };
+  };
+
+  firefox-devedition = buildMozillaMach rec {
+    pname = "firefox-devedition";
+    version = "112.0b6";
+    applicationName = "Mozilla Firefox Developer Edition";
+    branding = "browser/branding/aurora";
+    src = fetchurl {
+      url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
+      sha512 = "sha512-UJjZ4HFaO6XUpFt+d61KXdliN3FW0BDHFpwt4f6/pv6Rv10mxeRUnGKZDomoLwv+yCgN3EKDZ+iPA9FzkLxZCQ==";
+    };
+
+    meta = {
+      description = "A web browser built from Firefox Developer Edition source tree";
+      homepage = "http://www.mozilla.com/en-US/firefox/";
+      maintainers = with lib.maintainers; [ jopejoe1 ];
+      platforms = lib.platforms.unix;
+      badPlatforms = lib.platforms.darwin;
+      broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
+                                             # not in `badPlatforms` because cross-compilation on 64-bit machine might work.
+      maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
+      license = lib.licenses.mpl20;
+    };
+    tests = [ nixosTests.firefox-devedition ];
+    updateScript = callPackage ./update.nix {
+      attrPath = "firefox-devedition-unwrapped";
+      versionSuffix = "b[0-9]*";
+      baseUrl = "https://archive.mozilla.org/pub/devedition/releases/";
+    };
+  };
+
  firefox-esr-102 = buildMozillaMach rec {
    pname = "firefox-esr-102";
    version = "102.9.0esr";
--- a/pkgs/applications/networking/cluster/kubedog/default.nix
+++ b/pkgs/applications/networking/cluster/kubedog/default.nix
@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "kubedog";
-  version = "0.9.9";
+  version = "0.9.11";

  src = fetchFromGitHub {
    owner = "werf";
    repo = "kubedog";
    rev = "v${version}";
-    hash = "sha256-j7LR6+c2ZZJCqmHihXodtiF5bJhNR8eizDEqwm9IUn0=";
+    hash = "sha256-yHyCmUjxvMzeHpG5OqC3nAjWaiHErTXrbmS+/0Y4A7E=";
  };

-  vendorHash = "sha256-UPfB3nOzJpqh14xLKZP2mLfg7C55nQivrkmh3B7aKzo=";
+  vendorHash = "sha256-OgfgCsysNtY7mZQXdmHFyJ0FqmBD3SeQdTLd5Lw3F7k=";

  subPackages = [ "cmd/kubedog" ];

--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@ -20,16 +20,16 @@

 buildGoModule rec {
  pname = "kubernetes";
-  version = "1.26.1";
+  version = "1.26.3";

  src = fetchFromGitHub {
    owner = "kubernetes";
    repo = "kubernetes";
    rev = "v${version}";
-    sha256 = "sha256-bC2Q4jWBh27bqLGhvG4JcuHIAQmiGz5jDt9Me9qbVpk=";
+    hash = "sha256-dJMfnd82JIPxyVisr5o9s/bC3ZDiolF841pmV4c9LN8=";
  };

-  vendorSha256 = null;
+  vendorHash = null;

  doCheck = false;

--- a/pkgs/applications/networking/cluster/linkerd/edge.nix
+++ b/pkgs/applications/networking/cluster/linkerd/edge.nix
@ -2,7 +2,7 @@

 (callPackage ./generic.nix { }) {
  channel = "edge";
-  version = "23.3.2";
-  sha256 = "1vbi24nd8mh7vpzxy6qbjd3b7ifg16yc6abb8yvnqvxws8klpj8f";
-  vendorSha256 = "sha256-sWNaCmh1fbtJOIHMwA4XAyGUNWpqME+PfmbxSFfH4ws=";
+  version = "23.3.3";
+  sha256 = "014s1g7v8187ipk5y2azjbrvx6lxhrafkr4k78d7gxpirk50dwhy";
+  vendorSha256 = "sha256-kcAtu/YrCgPPamPMEEUUwGBPdiCT9oGQEuYoIq9vGow=";
 }
--- a/pkgs/applications/networking/cluster/pachyderm/default.nix
+++ b/pkgs/applications/networking/cluster/pachyderm/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "pachyderm";
-  version = "2.5.1";
+  version = "2.5.2";

  src = fetchFromGitHub {
    owner = "pachyderm";
    repo = "pachyderm";
    rev = "v${version}";
-    hash = "sha256-HFIDss01nxBoRQI+Hu8Q02pnIg4DWe7XROl0Z33oubI=";
+    hash = "sha256-COtOYR1toSr+oiRZ5Hfbgfy2InF9jFThT0ozwrcSVio=";
  };

-  vendorHash = "sha256-MVcbeQ4qAX9zVlT81yZd5xvo1ggVNpCZJozBoql2W9o=";
+  vendorHash = "sha256-XmIPifozTYd1rV2wm0dU0GPvg/+HFoSLGHB6DDrkzVc=";

  subPackages = [ "src/server/cmd/pachctl" ];

--- a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix
+++ b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix
@ -6,7 +6,7 @@

 buildGo120Package rec {
  pname = "ssm-session-manager-plugin";
-  version = "1.2.398.0";
+  version = "1.2.463.0";

  goPackagePath = "github.com/aws/session-manager-plugin";

@ -14,7 +14,7 @@ buildGo120Package rec {
    owner = "aws";
    repo = "session-manager-plugin";
    rev = version;
-    sha256 = "ufNnr/sxOHUDUsGXwxp1yloVAI6DMtuEdjcQZ2XaHRg=";
+    sha256 = "sha256-0n7/3CAPf+ioSE041Zik9xeHt5qtrdHotJjBWhizExo=";
  };

  postPatch = ''
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -110,13 +110,13 @@
    "vendorHash": null
  },
  "aws": {
-    "hash": "sha256-j+hKWMHnIE6nmRdGHaQxLybeljmheZ7t83NSXVWViZI=",
+    "hash": "sha256-7LN+ezJMoBsH/WiJuVbkVyaOURUHTuY1kJ8gBOebAIM=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/aws",
    "owner": "hashicorp",
    "repo": "terraform-provider-aws",
-    "rev": "v4.59.0",
+    "rev": "v4.60.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-TGzTElOmYW6XO4EtMD9MWvdvd1opnFSAVcEA2eYCQdk="
+    "vendorHash": "sha256-ydAQqeaj/XN3VXNpcJAYYOV0iXSQVUraWUZKDoZOyrw="
  },
  "azuread": {
    "hash": "sha256-MGCGfocs16qmJnvMRRD7TRHnPkS17h+oNUkMARAQhLs=",
@ -328,13 +328,13 @@
    "vendorHash": "sha256-Ba4J6LUchqhdZTxcJxTgP20aZVioybIzKvF4j5TDQIk="
  },
  "dnsimple": {
-    "hash": "sha256-8xESl8n/AMURVtnJ9Gd0eZ+flbdLya8RotRBgMF7mBk=",
+    "hash": "sha256-fLYaGjQy4NtXuVePYQ8/dI7W04QM6UV3h6f2qU8hM6k=",
    "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple",
    "owner": "dnsimple",
    "repo": "terraform-provider-dnsimple",
-    "rev": "v0.16.2",
+    "rev": "v0.16.3",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-Id1rL/Mu/aES7OFQ/rQRMmm3D/GSbGofZludqbWffKo="
+    "vendorHash": "sha256-gARkcCVDxamHHyLhUaJ85OGDmUjeOW8LUxVyM348QUY="
  },
  "docker": {
    "hash": "sha256-UyHOI8C0eDV5YllAi9clHp/CEldHjIp3FHHMPy1rK58=",
@ -639,11 +639,11 @@
    "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao="
  },
  "kubernetes": {
-    "hash": "sha256-4TUUejEKbnsRmqwdQVhHF+QWW8kReq+ZQQvpcT+YhsQ=",
+    "hash": "sha256-FV5FoEd0zjXa8x77r/z8Tn/I1lZI1NZ4a8yisAuAhNQ=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes",
    "owner": "hashicorp",
    "repo": "terraform-provider-kubernetes",
-    "rev": "v2.18.1",
+    "rev": "v2.19.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@ -856,13 +856,13 @@
    "vendorHash": "sha256-62q67aaOZA3fQmyL8bEHB+W497bcx9Xy7kKrbkjkbaI="
  },
  "opentelekomcloud": {
-    "hash": "sha256-fkEQ4VWGJiPFTA6Wz8AxAiL4DOW+Kewl8T9ywy/yPME=",
+    "hash": "sha256-ZDhihbYH6O6UCU2WOkPE+tcOODkAsbx7v9Vg1wrbklg=",
    "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
    "owner": "opentelekomcloud",
    "repo": "terraform-provider-opentelekomcloud",
-    "rev": "v1.33.2",
+    "rev": "v1.34.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-EbUHKM6fKEZk1ey4qTgAd/20OKJu0DoBF0MAOxB7y64="
+    "vendorHash": "sha256-tLtgg6QQiXivDxDVEYeOnLqXobwN7ZFqQrI0d3pUHeE="
  },
  "opsgenie": {
    "hash": "sha256-Wbe+DyK5wKuZZX8yd3DJN+2wT8KZt+YsBwJYKnZnfcI=",
@ -1072,13 +1072,13 @@
    "vendorHash": "sha256-fgvNdBwkz+YHOrLRQSe1D+3/VUhttKkJGzV6cg57g8s="
  },
  "sumologic": {
-    "hash": "sha256-1BwhcyEJs7Xm+p2ChA9K7g+qBzqoh3eyAT9qKMfHB1g=",
+    "hash": "sha256-sJo3dGGtKT+hPo9qVA+2BYkJhNY9N9FrgKpHqdTYrUQ=",
    "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic",
    "owner": "SumoLogic",
    "repo": "terraform-provider-sumologic",
-    "rev": "v2.21.0",
+    "rev": "v2.22.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-dpMa+XnfavXO0lXiBZOsU+O+5/3a/IMkfzpQcnD/sSw="
+    "vendorHash": "sha256-iNBM4Y24vDGPKyb5cppSogk145F0/pAFmOzEeiWgfLI="
  },
  "tailscale": {
    "hash": "sha256-X3YV640d3pLyKm/v88oEhXfYnox+ksrEWKgiJbYl6gk=",
@ -1108,13 +1108,13 @@
    "vendorHash": null
  },
  "tfe": {
-    "hash": "sha256-eFyRa4T+CqIeOcEYj4DQP6ypR7AROYrGDYuYSqBfKr0=",
+    "hash": "sha256-K0l9oaYkgilz47ErUxio9oJtPHQTWZnKdPpjRZ1SDhg=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
    "owner": "hashicorp",
    "repo": "terraform-provider-tfe",
-    "rev": "v0.42.0",
+    "rev": "v0.43.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-bhAoNJSbrpAzw0qCKIm84h6tFqUWT0JeBs1gJpPeJdU="
+    "vendorHash": "sha256-plYy3INLi/SeKu7R0lDLY1CvRDU7bmZsQKzFtMc2Wu4="
  },
  "thunder": {
    "hash": "sha256-GLyGm9Q+ajuQFIni/OCYvYhpj2fiVYHzkPwbofq/DEs=",
@ -1254,13 +1254,13 @@
    "vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ="
  },
  "yandex": {
-    "hash": "sha256-XT31rLurZAvjE08cAGIkd7pcS1LMdOIU6e60qLrLsXI=",
+    "hash": "sha256-bkKGZAGxeJC5JeVwRB+moChFvTF2zUHxB75H82RSACI=",
    "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
    "owner": "yandex-cloud",
    "proxyVendor": true,
    "repo": "terraform-provider-yandex",
-    "rev": "v0.87.0",
+    "rev": "v0.88.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-r2+ARKvTghscGBhmZpz84vdBudiy2OsmQR03oDz5gbs="
+    "vendorHash": "sha256-X8jQnuTtuN1M2qDYaE0dgOdB2DdgyQashsGb8mZOycQ="
  }
 }
--- a/pkgs/applications/networking/freefilesync/default.nix
+++ b/pkgs/applications/networking/freefilesync/default.nix
@ -1,8 +1,11 @@
 { lib
-, gcc12Stdenv
+, stdenv
 , fetchFromGitHub
 , fetchpatch
+, copyDesktopItems
 , pkg-config
+, wrapGAppsHook
+, unzip
 , curl
 , glib
 , gtk3
@ -10,10 +13,10 @@
 , openssl
 , wxGTK32
 , gitUpdater
-, wrapGAppsHook
+, makeDesktopItem
 }:

-gcc12Stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
  pname = "freefilesync";
  version = "12.1";

@ -24,30 +27,26 @@ gcc12Stdenv.mkDerivation rec {
    hash = "sha256-KA3Bn8skJ2gMmihmwlUmN6jXZmfoYY/f4vqbKwvxwgw=";
  };

-  # Patches from ROSA Linux
+  # Patches from Debian
  patches = [
    # Disable loading of the missing Animal.dat
    (fetchpatch {
-      url = "https://abf.io/import/freefilesync/raw/rosa2021.1-11.25-1/ffs_devuan.patch";
-      sha256 = "sha256-o8T/tBinlhM1I82yXxm0ogZcZf+uri95vTJrca5mcqs=";
+      url = "https://sources.debian.org/data/main/f/freefilesync/12.0-2/debian/patches/ffs_devuan.patch";
      excludes = [ "FreeFileSync/Source/ffs_paths.cpp" ];
-      postFetch = ''
-        substituteInPlace $out --replace " for Rosa" ""
-      '';
+      hash = "sha256-6pHr5txabMTpGMKP7I5oe1lGAmgb0cPW8ZkPv/WXN74=";
    })
    # Fix build with GTK 3
    (fetchpatch {
-      url = "https://abf.io/import/freefilesync/raw/rosa2021.1-11.25-1/ffs_devuan_gtk3.patch";
-      sha256 = "sha256-NXt/+BRTcMk8bnjR9Hipv1NzV9YqRJqy0e3RMInoWsA=";
-      postFetch = ''
-        substituteInPlace $out --replace "-isystem/usr/include/gtk-3.0" ""
-      '';
+      url = "https://sources.debian.org/data/main/f/freefilesync/12.0-2/debian/patches/ffs_devuan_gtk3.patch";
+      hash = "sha256-0n58Np4JI3hYK/CRBytkPHl9Jp4xK+IRjgUvoYti/f4=";
    })
  ];

  nativeBuildInputs = [
-    wrapGAppsHook
+    copyDesktopItems
    pkg-config
+    wrapGAppsHook
+    unzip
  ];

  buildInputs = [
@ -88,9 +87,31 @@ gcc12Stdenv.mkDerivation rec {
    cp -R FreeFileSync/Build/* $out
    mv $out/{Bin,bin}

+    mkdir -p $out/share/pixmaps
+    unzip -j $out/Resources/Icons.zip '*Sync.png' -d $out/share/pixmaps
+
    runHook postInstall
  '';

+  desktopItems = [
+    (makeDesktopItem rec {
+      name = "FreeFileSync";
+      desktopName = name;
+      genericName = "Folder Comparison and Synchronization";
+      icon = name;
+      exec = name;
+      categories = [ "Utility" "FileTools" ];
+    })
+    (makeDesktopItem rec {
+      name = "RealTimeSync";
+      desktopName = name;
+      genericName = "Automated Synchronization";
+      icon = name;
+      exec = name;
+      categories = [ "Utility" "FileTools" ];
+    })
+  ];
+
  passthru.updateScript = gitUpdater {
    rev-prefix = "v";
  };
--- a/pkgs/applications/networking/hpmyroom/default.nix
+++ b/pkgs/applications/networking/hpmyroom/default.nix
@ -4,11 +4,11 @@
 }:
 mkDerivation rec {
  pname = "hpmyroom";
-  version = "12.1.1.0257";
+  version = "12.9.0.0601";

  src = fetchurl {
    url = "https://www.myroom.hpe.com/downloadfiles/${pname}-${version}.x86_64.rpm";
-    sha256 = "1xm41v324zq1x5awgb7fr238f7ml7vq6jrfh84358i5shgha1g2k";
+    sha256 = "sha256-1BC4EjCCLAuCIOV+jJn3pfKKW7UJI5tfC+wg0FUgB64=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/networking/mailreaders/himalaya/default.nix
+++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix
@ -2,44 +2,51 @@
 , rustPlatform
 , fetchFromGitHub
 , stdenv
-, enableCompletions ? stdenv.hostPlatform == stdenv.buildPlatform
 , installShellFiles
+, installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform
+, installManPages ? stdenv.hostPlatform == stdenv.buildPlatform
 , pkg-config
 , Security
 , libiconv
 , openssl
+, notmuch
+, withImapBackend ? true
+, withNotmuchBackend ? false
+, withSmtpSender ? true
 }:

 rustPlatform.buildRustPackage rec {
  pname = "himalaya";
-  version = "0.6.0";
+  version = "0.7.1";

  src = fetchFromGitHub {
    owner = "soywod";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-d+ERCUPUHx41HfBtjb6BjhGKzkUTGIb01BRWvAnLYwk=";
+    sha256 = "sha256-yAfNH9LSXlS/Hzi5kAuur5BX2vITMucprDzxhlV8RiY=";
  };

-  cargoSha256 = "sha256-ICaahkIP1uSm4iXvSPMo8uVTtSa1nCyJdDihGdVEQvg=";
+  cargoSha256 = "sha256-FXfh6T8dNsnD/V/wYSMDWs+ll0d1jg1Dc3cQT39b0ws=";

-  nativeBuildInputs = lib.optionals enableCompletions [ installShellFiles ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ];
+  nativeBuildInputs = [ ]
+    ++ lib.optional (installManPages || installShellCompletions) installShellFiles
+    ++ lib.optional (!stdenv.hostPlatform.isDarwin) pkg-config;

-  buildInputs =
-    if stdenv.hostPlatform.isDarwin then [
-      Security
-      libiconv
-    ] else [
-      openssl
-    ];
+  buildInputs = [ ]
+    ++ (if stdenv.hostPlatform.isDarwin then [ Security libiconv ] else [ openssl ])
+    ++ lib.optional withNotmuchBackend notmuch;

-  # flag added because without end-to-end testing is ran which requires
-  # additional tooling and servers to test
-  cargoTestFlags = [ "--lib" ];
+  buildNoDefaultFeatures = true;
+  buildFeatures = [ ]
+    ++ lib.optional withImapBackend "imap-backend"
+    ++ lib.optional withNotmuchBackend "notmuch-backend"
+    ++ lib.optional withSmtpSender "smtp-sender";

-  postInstall = lib.optionalString enableCompletions ''
-    # Install shell function
+  postInstall = lib.optionalString installManPages ''
+    mkdir -p $out/man
+    $out/bin/himalaya man $out/man
+    installManPage $out/man/*
+  '' + lib.optionalString installShellCompletions ''
    installShellCompletion --cmd himalaya \
      --bash <($out/bin/himalaya completion bash) \
      --fish <($out/bin/himalaya completion fish) \
@ -50,7 +57,7 @@ rustPlatform.buildRustPackage rec {
    description = "Command-line interface for email management";
    homepage = "https://github.com/soywod/himalaya";
    changelog = "https://github.com/soywod/himalaya/blob/v${version}/CHANGELOG.md";
-    license = licenses.bsdOriginal;
-    maintainers = with maintainers; [ toastal yanganto ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ soywod toastal yanganto ];
  };
 }
--- a/pkgs/applications/networking/mullvad-vpn/default.nix
+++ b/pkgs/applications/networking/mullvad-vpn/default.nix
@ -43,11 +43,11 @@ in

 stdenv.mkDerivation rec {
  pname = "mullvad-vpn";
-  version = "2023.1";
+  version = "2023.2";

  src = fetchurl {
    url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb";
-    sha256 = "sha256-+Nh4CYjivjrCmohzQMSjb9z5bgACAvot5oUABPUFExQ=";
+    sha256 = "sha256-3evIB8IW0bioRqtpAdCRQhDywu8xPMN1oxhqQGIBANY=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@ -24,11 +24,11 @@

 stdenv.mkDerivation rec {
  pname = "liferea";
-  version = "1.14.1";
+  version = "1.14.2";

  src = fetchurl {
    url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
-    sha256 = "5g74oN+NiKm/hnBLZvDxnAcBuP6B4y1Nsvb6nShZBnw=";
+    sha256 = "aXgw3MwleHDw2yNbs5Cin687xVTLxeNwBt94c1b4fXQ=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/office/treesheets/default.nix
+++ b/pkgs/applications/office/treesheets/default.nix
@ -12,13 +12,13 @@

 stdenv.mkDerivation rec {
  pname = "treesheets";
-  version = "unstable-2023-03-07";
+  version = "unstable-2023-03-18";

  src = fetchFromGitHub {
    owner = "aardappel";
    repo = "treesheets";
-    rev = "6672b90aa6310f2a02d9527f500645dd525a8fe3";
-    sha256 = "uf4fSkMGVS1/H5HwKTo0Fp69CjI3C9Bmw07oP9PYvlQ=";
+    rev = "fd73698ba15b36cfd1f1726e51558405a56c6cd2";
+    sha256 = "kGpze5aBbBjhLTU9jV2xX44iO82skgbxVKc0lHndezw=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/science/biology/diamond/default.nix
+++ b/pkgs/applications/science/biology/diamond/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "diamond";
-  version = "2.1.5";
+  version = "2.1.6";

  src = fetchFromGitHub {
    owner = "bbuchfink";
    repo = "diamond";
    rev = "v${version}";
-    sha256 = "sha256-ud11GNuDL1HDNaAzkNB/ebuPJR4wgWYy49zBr93BtSo=";
+    sha256 = "sha256-2FxJTF/fF/Xi0TglXDlf3sSwncv2f6gc129nTbk8YU0=";
  };


--- a/pkgs/applications/science/math/gretl/default.nix
+++ b/pkgs/applications/science/math/gretl/default.nix
@ -3,11 +3,11 @@

 stdenv.mkDerivation rec {
  pname = "gretl";
-  version = "2022c";
+  version = "2023a";

  src = fetchurl {
    url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz";
-    sha256 = "sha256-4QAQTNqbfIX6K3CdtKcVONtCWrkTRvGl2ZXGR1eyQdA=";
+    sha256 = "sha256-T1UwQhw/Tr/juYqVJBkst2LRBCIXPLvVd0N+QCJcVtM=";
  };

  buildInputs = [
--- a/pkgs/applications/version-management/git-dive/default.nix
+++ b/pkgs/applications/version-management/git-dive/default.nix
@ -4,21 +4,25 @@
 , pkg-config
  # libgit2-sys doesn't support libgit2 1.6 yet
 , libgit2_1_5
+, oniguruma
 , zlib
+, stdenv
+, darwin
+, git
 }:

 rustPlatform.buildRustPackage rec {
  pname = "git-dive";
-  version = "0.1.4";
+  version = "0.1.5";

  src = fetchFromGitHub {
    owner = "gitext-rs";
    repo = "git-dive";
    rev = "v${version}";
-    hash = "sha256-nl6JEVOU5eDntPOItYCooBi3zx2ceyRLtelr97uYiOY=";
+    hash = "sha256-LOvrPId/GBWPq73hdCdaMNKH7K7cmGmlkepkQiwGC60=";
  };

-  cargoHash = "sha256-johUvl2hPlgn+2wgFJUR6/pR7lx1NzE4ralcjhVqkik=";
+  cargoHash = "sha256-JDybjIUjj9ivJ5hJJB9bvGB18TdwEXQZfKfXPkyopK0=";

  nativeBuildInputs = [
    pkg-config
@ -26,16 +30,31 @@ rustPlatform.buildRustPackage rec {

  buildInputs = [
    libgit2_1_5
+    oniguruma
    zlib
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
  ];

+  nativeCheckInputs = [
+    git
+  ];
+
+  # don't use vendored libgit2
+  buildNoDefaultFeatures = true;
+
  checkFlags = [
    # requires internet access
    "--skip=screenshot"
  ];

-  # don't use vendored libgit2
-  buildNoDefaultFeatures = true;
+  preCheck = ''
+    export HOME=$(mktemp -d)
+    git config --global user.name nixbld
+    git config --global user.email nixbld@example.com
+  '';
+
+  RUSTONIG_SYSTEM_LIBONIG = true;

  meta = with lib; {
    description = "Dive into a file's history to find root cause";
--- a/pkgs/applications/video/filebot/default.nix
+++ b/pkgs/applications/video/filebot/default.nix
@ -4,11 +4,11 @@

 stdenv.mkDerivation rec {
  pname = "filebot";
-  version = "4.9.6";
+  version = "5.0.1";

  src = fetchurl {
    url = "https://web.archive.org/web/20220305095926/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
-    sha256 = "sha256-3j0WmmamE9KUNwjOVZvrdFH5dS/9FHSdbLfcAsOzQOo=";
+    sha256 = "sha256-0d0+o8ZiF1m83AasjoxUDNtUSquy69wFY1m1oYeybFw=";
  };

  unpackPhase = "tar xvf $src";
--- a/pkgs/applications/video/olive-editor/default.nix
+++ b/pkgs/applications/video/olive-editor/default.nix
@ -1,34 +1,69 @@
-{ lib, stdenv, fetchFromGitHub
-, pkg-config, which, qmake, wrapQtAppsHook
-, qtmultimedia, frei0r, opencolorio_1, ffmpeg-full, CoreFoundation }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, which
+, frei0r
+, opencolorio
+, ffmpeg-full
+, CoreFoundation
+, cmake
+, wrapQtAppsHook
+, openimageio
+, openexr_3
+, portaudio
+, imath
+, qtwayland
+, qtmultimedia
+, qttools
+}:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "olive-editor";
-  version = "0.1.2";
+  version = "unstable-2023-03-20";

  src = fetchFromGitHub {
+    fetchSubmodules = true;
    owner = "olive-editor";
    repo = "olive";
-    rev = version;
-    sha256 = "151g6jwhipgbq4llwib92sq23p1s9hm6avr7j4qq3bvykzrm8z1a";
+    rev = "8ca16723613517c41304de318169d27c571b90af";
+    sha256 = "sha256-lL90+8L7J7pjvhbqfeIVF0WKgl6qQzNun8pL9YPL5Is=";
  };

-  patches = [
-    ./q-painter-path.patch
+  cmakeFlags = [
+    "-DBUILD_QT6=1"
  ];

+  # https://github.com/olive-editor/olive/issues/2200
+  patchPhase = ''
+    runHook prePatch
+    substituteInPlace ./app/node/project/serializer/serializer.h \
+      --replace 'QStringRef' 'QStringView'
+    substituteInPlace ./app/node/project/serializer/serializer.cpp \
+      --replace 'QStringRef' 'QStringView'
+    substituteInPlace ./app/node/project/serializer/serializer230220.cpp \
+      --replace 'QStringRef' 'QStringView'
+    runHook postPatch
+  '';
+
  nativeBuildInputs = [
    pkg-config
    which
-    qmake
+    cmake
    wrapQtAppsHook
  ];

  buildInputs = [
    ffmpeg-full
    frei0r
-    opencolorio_1
+    opencolorio
+    openimageio
+    imath
+    openexr_3
+    portaudio
+    qtwayland
    qtmultimedia
+    qttools
  ] ++ lib.optional stdenv.isDarwin CoreFoundation;

  meta = with lib; {
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@ -61,13 +61,13 @@ let
 in
 buildGoModule rec {
  pname = "podman";
-  version = "4.4.2";
+  version = "4.4.3";

  src = fetchFromGitHub {
    owner = "containers";
    repo = "podman";
    rev = "v${version}";
-    hash = "sha256-337PFsPGm7pUgnFeNJKwT+/7AdbWSfCx4kXyAvHyWJQ=";
+    hash = "sha256-s0aGZN4rnyyNLoO3nnAO7KbeD7MYxE9VMOHrQsKGNBk=";
  };

  patches = [
--- a/pkgs/build-support/rust/build-rust-package/sysroot/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/sysroot/default.nix
@ -1,10 +1,10 @@
-{ stdenv, rust, rustPlatform, buildPackages }:
+{ lib, stdenv, rust, rustPlatform, buildPackages }:

 { shortTarget, originalCargoToml, target, RUSTFLAGS }:

 let
  cargoSrc = import ../../sysroot/src.nix {
-    inherit stdenv rustPlatform buildPackages originalCargoToml;
+    inherit lib stdenv rustPlatform buildPackages originalCargoToml;
  };
 in rustPlatform.buildRustPackage {
  inherit target RUSTFLAGS;
@ -14,7 +14,7 @@ in rustPlatform.buildRustPackage {

  RUSTC_BOOTSTRAP = 1;
  __internal_dontAddSysroot = true;
-  cargoSha256 = "0y6dqfhsgk00y3fv5bnjzk0s7i30nwqc1rp0xlrk83hkh80x81mw";
+  cargoSha256 = "sha256-zgkwevitxsu1C4OgGTsqNSc0gDxaNXYK1WPbfER48d0=";

  doCheck = false;

@ -29,4 +29,7 @@ in rustPlatform.buildRustPackage {
    host=${rust.toRustTarget stdenv.buildPlatform}
    cp -r $RUST_SYSROOT/lib/rustlib/$host $out
  '';
+
+  # allows support for cross-compilation
+  meta.platforms = lib.platforms.all;
 }
--- a/pkgs/build-support/rust/replace-workspace-values.py
+++ b/pkgs/build-support/rust/replace-workspace-values.py
@ -63,8 +63,16 @@ def replace_dependencies(


 def main() -> None:
+    top_cargo_toml = load_file(sys.argv[2])
+
+    if "workspace" not in top_cargo_toml:
+        # If top_cargo_toml is not a workspace manifest, then this script was probably
+        # ran on something that does not actually use workspace dependencies
+        print(f"{sys.argv[2]} is not a workspace manifest, doing nothing.")
+        return
+
    crate_manifest = load_file(sys.argv[1])
-    workspace_manifest = load_file(sys.argv[2])["workspace"]
+    workspace_manifest = top_cargo_toml["workspace"]

    if "workspace" in crate_manifest:
        return
--- a/pkgs/build-support/rust/sysroot/Cargo.lock
+++ b/pkgs/build-support/rust/sysroot/Cargo.lock
@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "alloc"
 version = "0.0.0"
@ -10,9 +12,9 @@ dependencies = [

 [[package]]
 name = "compiler_builtins"
-version = "0.1.52"
+version = "0.1.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6591c2442ee984e2b264638a8b5e7ae44fd47b32d28e3a08e2e9c3cdb0c2fb0"
+checksum = "f867ce54c09855ccd135ad4a50c777182a0c7af5ff20a8f537617bd648b10d50"
 dependencies = [
 "rustc-std-workspace-core",
 ]
--- a/pkgs/build-support/rust/sysroot/src.nix
+++ b/pkgs/build-support/rust/sysroot/src.nix
@ -19,7 +19,7 @@ stdenv.mkDerivation {
  + ''
    ${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py}
    mkdir -p $out/src
-    touch $out/src/lib.rs
+    echo '#![no_std]' > $out/src/lib.rs
    cp Cargo.toml $out/Cargo.toml
    cp ${./Cargo.lock} $out/Cargo.lock
  '';
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@ -11,7 +11,7 @@ let
    (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
 in stdenv.mkDerivation rec {
  pname = "${name}-bin";
-  version = "21.1.0";
+  version = "21.1.1";

  src = fetchurl {
    url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
--- a/pkgs/data/fonts/iosevka/variants.nix
+++ b/pkgs/data/fonts/iosevka/variants.nix
@ -1,95 +1,95 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  iosevka = "0kw1jynkl3dfvs8pm54sr1rlg1zd0g57jqnnfnlm1jrpwh28b1ba";
-  iosevka-aile = "1jsp3nhkf9a5vgnxq57p7fqqj352r7kvqvdmzvw8y3snppxk3czf";
-  iosevka-curly = "1bdwgadvwksyrq5m209jliwr3ywfkn090j5q07hm9zzpygnwgw8m";
-  iosevka-curly-slab = "059yv1b1h8ksglaly20mf5jyhsbfi3y2lvr8jhg5fhmcp6mginqj";
-  iosevka-etoile = "11l29xc4s9yb56f6n2q7hh6bvzq9pjfc3j9zpd15y11cm382a70s";
-  iosevka-slab = "1vzansf0a8zfif7i2g5znwgdzkcjj16qga19y1386fci0z1vm9ib";
-  iosevka-ss01 = "0179zprfy8l27jyk4hjb0da2z5qq4pgkvnbmnxvlrf5mqbrmph6v";
-  iosevka-ss02 = "0kmfyp3hgacgdrbh6rkyig9m95j33nxx1xlmcsi7rq7i6rxj9ixs";
-  iosevka-ss03 = "0irlr2r1lnlb56zmq3blq84r5sy4gsmr50chw5g6b01ygx6263hk";
-  iosevka-ss04 = "0dyw52i73msayy76w77r79pgali1rjas8zgpfq2l2q9z2d7m945i";
-  iosevka-ss05 = "0ynm24xdhsl9jkdhjadc7ks4rrrl8ri2fj1vndw7ymrp95mh8kia";
-  iosevka-ss06 = "1md6zgvj30fw6hbsx6vx5n56lxavlr5wzsmyw0a4y37lb9q5ch61";
-  iosevka-ss07 = "09qyxicbq7kalxxll5mcs5vgd9g80lxzw8zin6yrclm5hghz9x8x";
-  iosevka-ss08 = "14mvfpc17n5lzn3amp3s27c3r513jlbffcw084wsppjbvaqyv063";
-  iosevka-ss09 = "1h06sp9s6dqn0inki37h3qv350a6jaf82xjad8wlx3kbgbs5vr7d";
-  iosevka-ss10 = "0j0ryw12c21z7qijplws7fhhvd3p0xvfvx17b38i9yf1m3i9lswv";
-  iosevka-ss11 = "0kknvqqxhp9qdjg172s75j8mhm49204528xsylabifpf9225qxm7";
-  iosevka-ss12 = "1skvr7vp9p0ndbic5l2j3zp5rq1mnfjv91s15msi96pqdsg3acr4";
-  iosevka-ss13 = "185b0zyg0gz3560fpr7crzan3jdymvhap2hw789yzygswl6mqz8b";
-  iosevka-ss14 = "1sdzi8ncm6mypqza7yl2c3f25jf9596d8a0z6d6ppad9x00jrx32";
-  iosevka-ss15 = "1jkjcag0zx5rnh2hv847q6fvh0v2vypc6l981kkrql3qbqd4lk9q";
-  iosevka-ss16 = "1dbkc950lw5iv3rh0x1zxlr52iwsvvxpr1cilr54hqiq8qjv6rc9";
-  iosevka-ss17 = "0iyfis5mfmf7s1k45a8pbmdz5wj2q444vgqj1a4ndk0r1aphvrnp";
-  iosevka-ss18 = "0jdi9vgq07sf9s1fs1syd6acj37s1cymrm0i9id2g2yjnr1vm947";
-  sgr-iosevka = "0cihnnf51a3kwjmpd7iblwjanj0x9w69l7yx2isn3fs9y7r6dzbm";
-  sgr-iosevka-aile = "0bgcbm900j20yh6jkmqx1aji87410j2nfz84p96rdzcq8zyicf6i";
-  sgr-iosevka-curly = "0hf8hbn61pb5b9p0dnx5vzhx0ivb8x8x9abf91dlr5n20qs8gyzg";
-  sgr-iosevka-curly-slab = "0kc19qapsqq9l6g59k3kjbz4x6c4fl3xyg6wirp5p2nfiyhb8ww1";
-  sgr-iosevka-etoile = "1w9znis6f59x2l0i2x94qmvawxx3jzwz4d06b4sw066329fazbbx";
-  sgr-iosevka-fixed = "0xymjy1i2472p741iv5gr6366s6g9llmvkdkpx579dyk3shpabnl";
-  sgr-iosevka-fixed-curly = "14sgb2j66hv64nslhy5cq0zdv0yr4x3175w8dkyzvhagvlx3ra5h";
-  sgr-iosevka-fixed-curly-slab = "096b9jykaf2l9mqyji462ga4hy8s25qb5j0c000lsja8674f1mip";
-  sgr-iosevka-fixed-slab = "12cim6i3wydx6adzvcdg8knfajjzxvgxq021m65k7icw5yi47rpk";
-  sgr-iosevka-fixed-ss01 = "1gjl7swgg5vkrzq7fsr80bpnw68a0gsq2dhm3mfcjv24rqdhprxf";
-  sgr-iosevka-fixed-ss02 = "1cih7cp5lp1456d4q7nk6zk0yk6iybhrhixx926yc04vjl3iaali";
-  sgr-iosevka-fixed-ss03 = "02i8wipf12dxkkh92g2yqdh3cy6nvcl77q67pzl5746zgy48h987";
-  sgr-iosevka-fixed-ss04 = "01cl31s26lzfdrf5k8r4rgbwp69gczg0m107psda903x95hiyd6a";
-  sgr-iosevka-fixed-ss05 = "10cd8hvjzflkcv929radp9hj08hdr1a6da01fvr3gg59m1jg7hkp";
-  sgr-iosevka-fixed-ss06 = "01mpq5qsiws9ag4izq34mj15cilxkp529in29v2zc0vsi68a3n1s";
-  sgr-iosevka-fixed-ss07 = "00wd0valk2jhw82hlv9zdcdp97ysc361bm665rsncplnd97nx2jj";
-  sgr-iosevka-fixed-ss08 = "0ihgx6arv585k8p1rk5byhqm2f6ypbq26rnzihm2r11lg8hxyvqj";
-  sgr-iosevka-fixed-ss09 = "05zl4wz61sfjfa68zpjbvq7awibkxfkdnpimf5mikivhb13rmjjn";
-  sgr-iosevka-fixed-ss10 = "0k8p1ld2i9xiagahxhfabb7fhr9sq7cv7dpcyrja20hmwnm28qrl";
-  sgr-iosevka-fixed-ss11 = "159zaybnlrxd4q5iwhq7dsp09skvh13g734zk2l89xwsk5h2w4ns";
-  sgr-iosevka-fixed-ss12 = "0d2hzhlpl6rb9nqyygifbd09ylfvj4a9wlpmzpibbx06mrqcinri";
-  sgr-iosevka-fixed-ss13 = "0p99i58cwj39h1r2qhdrs3fasr75nw50m47iqjijn9mvgd01k82z";
-  sgr-iosevka-fixed-ss14 = "1m2s9wclk6xjxf4kjw0w0nffzx41s16www2nhm1v0lx1ikyj5pvl";
-  sgr-iosevka-fixed-ss15 = "04ykxwxibl1k3zxr9swywrg9v78hbf8vm4cbgscv78nm88srwykw";
-  sgr-iosevka-fixed-ss16 = "1kzj8b3356mh0ls2w5mv5hbqv3fwxk3izlw7xxd8q65cvrfs3gzq";
-  sgr-iosevka-fixed-ss17 = "1hnbni2f3lhr15j3y80rwihwjc4vvvnidjswan3ahwhh2qc8krlf";
-  sgr-iosevka-fixed-ss18 = "1cd5lhpkjcqlv0cr7nzh24xlc9912pnjfcppkcvmg7p0slg0zlkn";
-  sgr-iosevka-slab = "1zpmn157j5jpc9xmjqv0jga1hh8bc4b86f1xq651633ckf6ly6cq";
-  sgr-iosevka-ss01 = "0nacmqlh8rzkzhlzrsnpgrsznr8grd9kyxz77sfxyvn4d2i6lnwy";
-  sgr-iosevka-ss02 = "07hpwpbxj8z0zzya0zs1c5i4yssjmgv05w7q1xr64zsjffpd7m9k";
-  sgr-iosevka-ss03 = "19pcnyspbyq0bc33l9jsnmc808d9q20aglxnwv2jx97rwg2sv2mh";
-  sgr-iosevka-ss04 = "0wg8hi2465agxvx3yyflff5mbwfgvgayx2zvvjwakiy4sq0ymib6";
-  sgr-iosevka-ss05 = "1lr9brpkhb28ziw56idyk2k5vx5bw4zwbg6d1p4iwrirmwrxrjgi";
-  sgr-iosevka-ss06 = "1bwgmsdirfhqnri6lnrmwjiwm4xy0qscbkx3j6rx68j9x4fk4991";
-  sgr-iosevka-ss07 = "00p8slkgzivkikc9nxlhsda50vxm7bdj1gh95p7kvmnkxksckx7f";
-  sgr-iosevka-ss08 = "0yas5iq36dckl0zzgkz8qbqz4zlzapg4cgq89676n64wmhxpifci";
-  sgr-iosevka-ss09 = "1ds6gkm9rpxwg5vafm0vaadv6ww9hrh51q30n1f7vblk3mvj6wz4";
-  sgr-iosevka-ss10 = "01qldfwld13n1j340a3kl4b9ixd0y4kjws9ym4cp8l84p4ylk9h5";
-  sgr-iosevka-ss11 = "0z57jq0l5f7nqi04i9hr22hxwx350pkkhcis7lzh799gc9av2rp5";
-  sgr-iosevka-ss12 = "1zvns2g30918hcgwbhswp2645mqkkq3b07i8z6w7vg61y1zylgqp";
-  sgr-iosevka-ss13 = "1gydqrscy94v6iidhz7vak5xr5aln5127b3f3m1bb3x6gz5154wz";
-  sgr-iosevka-ss14 = "1g91lbmkw1r7prs7wbfdqhkrixil71zgnsd2zrr9v68g75r3gwyl";
-  sgr-iosevka-ss15 = "0zpb2jk7r6kfmjgirkyxcilxw92hya8v10xd7ad28cvr9p4jngwj";
-  sgr-iosevka-ss16 = "056rnnnzqc5wwfk92wik8sndyj7mlwmzvz0vd4imx5pa0x7cgznk";
-  sgr-iosevka-ss17 = "0qg7rm664anvsjbnrh3r039md3a68b5pxvgkpq9ls9mard4jd2zr";
-  sgr-iosevka-ss18 = "19hgnj7afpsy2n8ydqrkyl97s10893qxyaqg898xs2552prazcx5";
-  sgr-iosevka-term = "0qd1dx0q4x8km3222g9znimvzw9nzhhj4g3d4n2dq3hir0biwvkw";
-  sgr-iosevka-term-curly = "111lriaizsg80c4qljxsflm7p9la68kkh7ssqykkjs91a6qfsfs0";
-  sgr-iosevka-term-curly-slab = "08qbpwzzmnql92vwisb4bmsa9ajnffa50qy4kan34qpanrkgnps7";
-  sgr-iosevka-term-slab = "1gkfvp97vv3p2llxzk1zpvfr5lm0npg56gac083wy8jds837wzl9";
-  sgr-iosevka-term-ss01 = "123r80pciasa1gvyri4gn7706zf0f7shv5w0jyn88cgpklrbpjgx";
-  sgr-iosevka-term-ss02 = "0l4fzq1g93bmv24r7r9fjkkyzyyp8sgzq7501ayrzdc9yxj3hcs4";
-  sgr-iosevka-term-ss03 = "1jq9xm7qfx3jf603njfm9y1dbhj3dv2gbsyx1plch8q5x2kfpn49";
-  sgr-iosevka-term-ss04 = "07mv1pxy0smk7p549iz7jn030h3f6c2k5km62v54xhd47zmkmcqz";
-  sgr-iosevka-term-ss05 = "1n0szq4h32qbmrsyn942gn2w3rwbv2wa9l3nrrpdqn6bn33dhisl";
-  sgr-iosevka-term-ss06 = "1rhhk2cbmd3yr6pry8v1hl1kw84dgv84mbs9qi4lvfjfj5pknai9";
-  sgr-iosevka-term-ss07 = "1fnhld17m9ggfvjajm3cygx9n07w0bazdxz5jv6d2whczhbqgiqs";
-  sgr-iosevka-term-ss08 = "0w4fmznj9i7qg2ygzcnia1l0wg5sm85vqlij22g55ycw87fxi1l2";
-  sgr-iosevka-term-ss09 = "19z86rbdmszd5qzxlfsacdvg4dmcsm6fl17yna8sgkxhh562x7kj";
-  sgr-iosevka-term-ss10 = "19mhyqqbs7jfnlpx5dl5p7gp2i0kslmb9wzvkm4i3fs7cy06hzc7";
-  sgr-iosevka-term-ss11 = "1kg67yhc3adw0ahm940bsabnsr46k0z8m2d8q7jmml1w45llfxsf";
-  sgr-iosevka-term-ss12 = "1jc8d0hm0hh7p6wixr37qg36nb3jr5vfkwwc9qfvjv3snq38z139";
-  sgr-iosevka-term-ss13 = "1ksyzlafcph69a2mqajdavd2r5f88dfq3hbglwm3b14ijifgzj92";
-  sgr-iosevka-term-ss14 = "11ay1smy18qbn3qh6nbxyr58ldzc7x7aib51hvbnjrgx666f4lhp";
-  sgr-iosevka-term-ss15 = "0dnspjglxshn9qrc5ib5ygma03djj2n3kvkqss6sxl7lp27b9nz0";
-  sgr-iosevka-term-ss16 = "17hvq2x0zmpr93dym2i1izy3nnkplpszwjlwq35r07k7nikcs4ir";
-  sgr-iosevka-term-ss17 = "1jdk38a1q0s4my3n7kjrpas010j85yxxy1qylz48h0makw4vfmfy";
-  sgr-iosevka-term-ss18 = "1n57dzf7ks5plk6zprk8yyjvsj87l6jfkhsh4xmmzvwk78rkn4w4";
+  iosevka = "0nlc16faywn7jzc9zsa6f4ccd9r1b5ncmm4342j1fvj4850yicc1";
+  iosevka-aile = "0p9y4z2zgdb3hqyrn0pqxip8b2q7xwjnwf392ni9gkgzvsvmy1dv";
+  iosevka-curly = "1hhi2xhsahvbj285ia66w3mnb6c1axp5jlfknqki9z95i69mzmfp";
+  iosevka-curly-slab = "0k3cz39f9dmb58xawllzqczwhd23x75xklwvadc2rsi3m3r19070";
+  iosevka-etoile = "1hyavl45w7ia9w33bnhfcl3w4hb18qhf50al4mmzyw4cl4pwdxdk";
+  iosevka-slab = "1w7c7f3q2pj4rnvwywndr4a4b8nd7q3ray9fmkhisn479c87z8sr";
+  iosevka-ss01 = "0b19gn6shv4bd4zy0ay1wcx46avz1dahaw350mhiq5f807l7ilzi";
+  iosevka-ss02 = "0yzwlp7zccfyfby8lvx45rmrnd9dnmd4hzgbvrynw476byjaa78d";
+  iosevka-ss03 = "1ndpx5j70yxmszr4q6c8di8rxak1792gyjbl9914rzd0fhs3mfcn";
+  iosevka-ss04 = "0blhdf8grq7z28s7f6vfirfyil5vxazmk1597dxd8j54wi7zxzx4";
+  iosevka-ss05 = "0w07frh2z4xcmzm95a3g4d50jv9b1l3wnqj6rd2jqbm1n9rsab2a";
+  iosevka-ss06 = "0vrkkd98yv7wz23bbylfpk1kf01svvsmnfz3ac36vz6x0bzcy2qd";
+  iosevka-ss07 = "0mg5is3hv16wgk6sc394a36nfwfy1ki3qy41wf0qh9nrcmhk6hxy";
+  iosevka-ss08 = "1vbzv6hdiwj6qy50vjkyikh2b99cqsf8a25a6d2mgs790qna514k";
+  iosevka-ss09 = "0v7w6q6qgc72v8ylqnc94c384aiqball51a4wcxcbndqhskmisfj";
+  iosevka-ss10 = "10s3i7w6zg9arh554vc03bd8lv7lfkfdnhq65rzfmx3prh9l6d85";
+  iosevka-ss11 = "1rfbs3k576922mwyw9x5pzz8yawvpzznpvib0v78all0a0a7ycv9";
+  iosevka-ss12 = "18nz0x5fn5v826sfxxc78gq2l5q6fkr1xgb7m1h6y9zf49cb5qdi";
+  iosevka-ss13 = "0f6lgkxxwf9xcjacgq9a1wwlns827w5xh2djwq9rxnwfd4p629n9";
+  iosevka-ss14 = "02vcn31xnzbkh18yphrbshyg9zpdrhal2iqbcvwqdy9pj0hvqy1s";
+  iosevka-ss15 = "1w0p84dfmr04f5xw0xdyjd064dnv8603w1sf60132ln0m5zdw5nl";
+  iosevka-ss16 = "0h7my2b3vrf11z1rxvppk9zw1qrj0r311yyb3ca2k6pclpdv1776";
+  iosevka-ss17 = "13qwrfrrjkxdny40gsf4xpdk5291fkmz5yc6qhmb7s8kl3jxrrdc";
+  iosevka-ss18 = "09kfnjyq47dcf2ynqh6rki63057vy4sf5d86w4k35qs7xjrvk0rn";
+  sgr-iosevka = "1wqcpi7645485glh6fcjsj3way3ssswm6fdks8l2did9xm3213d0";
+  sgr-iosevka-aile = "1vax6a7w3mphbb4yvwyxvgblxpxsbng5p4ahsm52hm7wchi2x37q";
+  sgr-iosevka-curly = "0yxjvjy9k1ng0fsyxp83yg8wdadj8d1jyziy2p3k4x7dhbnp7iqn";
+  sgr-iosevka-curly-slab = "14xi01qjk8kinqqibqcgmrg09xgm1d7bf8dd2gjs0c9fjd8hxjwl";
+  sgr-iosevka-etoile = "1b6n9ph1rq94hw0crmb7ahnfc9bp5wyinrn3kjwlxdn53qk2zkq7";
+  sgr-iosevka-fixed = "1dmkpj5i4gjh3fv8sipkbi798fw7yhhnla16c68jldnc7sdshd59";
+  sgr-iosevka-fixed-curly = "1cdp11xjh5i14bwj3jsx7vbladh5j9rgqy9r18bbxs3z2xg3q3y6";
+  sgr-iosevka-fixed-curly-slab = "0yka45rja8wdng1k2l6smbf1azfs25byxfvq8rvjbfakm7ykva7l";
+  sgr-iosevka-fixed-slab = "1xz40hp07cvmyfsr7vgbyyphvg982xvc3arssbiqw7b57bpzfmvz";
+  sgr-iosevka-fixed-ss01 = "0j1wfwq2z42bazgambwpcy45g742wy7h9ls5c546vjm9i3dbg035";
+  sgr-iosevka-fixed-ss02 = "0dw2810wbpmcp04lp3hvh1s44k0a6fw1sgg9arhmvkvmxrjxkhhw";
+  sgr-iosevka-fixed-ss03 = "107iw60i3z9jslq8a66vf3c6p7f2wkmg5d8pdw14k0jdrc2fg9rq";
+  sgr-iosevka-fixed-ss04 = "18slm69psavwg2nnpcxzr09lc4aya192sf3mrgpvw0qw8j3p3adp";
+  sgr-iosevka-fixed-ss05 = "1676xxf2wbqsr726s0066xiv91ki4ckhbz7cs4qnggh01mrraqcq";
+  sgr-iosevka-fixed-ss06 = "03w821f78z090qzpqzzr26r4rcmp4jxy4lwgz6q71cg5b6xpfv8n";
+  sgr-iosevka-fixed-ss07 = "10xklsb1s53yj0bjf8q0ii6s8zddkhx1yyh5x86rsdapkk6rhwp6";
+  sgr-iosevka-fixed-ss08 = "0s6hkc7pnx73byc33wcqglqhd273rl3z9c2g4qy5a9qlfcyhgdsz";
+  sgr-iosevka-fixed-ss09 = "0gify4mz7fnkakpf3blnqh43w44azgyld4vkxrzxmnlblc22fazn";
+  sgr-iosevka-fixed-ss10 = "0f3351ddpq5kl3199jm96gpji0c11hy68wgk0b3vccdhbffyzbjr";
+  sgr-iosevka-fixed-ss11 = "1jkyzrj37clp93dsvs9d8278q2vblxdwhbqp69nk1pqcxdplx70h";
+  sgr-iosevka-fixed-ss12 = "1gh6pxq4fisnka4b64qx2ayffqlhqkk4625lcx6c8q60a73rim0s";
+  sgr-iosevka-fixed-ss13 = "1gg1pfi3l1g2gw1mwds52j8j6wxvv52nx1zhn96937gmw80b4vk8";
+  sgr-iosevka-fixed-ss14 = "1rnkw69lv7krs3fwv099hqnd7acnazizla3595x4cr220d2dbn2l";
+  sgr-iosevka-fixed-ss15 = "1icrs42jfijw5jwvkcqad5ln9n1pkmdg6nm4wy7p0q936xr6y00k";
+  sgr-iosevka-fixed-ss16 = "1y0p624187hjb85j78y25784473x7j82xj3g3g17w4g5p8n63mar";
+  sgr-iosevka-fixed-ss17 = "13kzwf0x1cqri5z3x5pq922mvqm0ji1vh0g3adf2gvz8dk10wwy6";
+  sgr-iosevka-fixed-ss18 = "1r9x62jdsrb9k88af4h0azk60z4yjdk39sdffw2liypfx4zlbmnv";
+  sgr-iosevka-slab = "15kl87w79kyb1sg76s69vj338ms8q3yq207l25k1sh59qzl0r5v7";
+  sgr-iosevka-ss01 = "161xggjrnrnr8bah8hslc5jsilp3qf505pr9nl2ly1amda8kpp9l";
+  sgr-iosevka-ss02 = "17cm9jy9wv0zyfs6r5fm2kd8h64j2qlxzny0q482a05frk21fx4p";
+  sgr-iosevka-ss03 = "0i1b851sklhx6vl6ckj6rfzjxh4y75pkjwwk2v5q3sskw35lfdml";
+  sgr-iosevka-ss04 = "0i4rx4bwvqd45b14d46k123m1wf7cd3gfpxhha4i5g8fmab5jyll";
+  sgr-iosevka-ss05 = "14dzvvaznf3j3dj3pis5h592vrjlgjiqcjf94gnalkfg83frrvfg";
+  sgr-iosevka-ss06 = "0gni839pida0ii43bfjydhnfsp8gjvnz0cjqb3cf046dgr12ynx5";
+  sgr-iosevka-ss07 = "1was57vafdmv9qgazd5kxd0glqbahi2cjkw1av30870nx05zyxmv";
+  sgr-iosevka-ss08 = "1f4gs5kk3b1x6vw49127pm8h5nbn0b81nnmfnd72gc0ml2jm1d8m";
+  sgr-iosevka-ss09 = "14kpzkv0xcy5v6x9x8rrcww9lrs8z9dmydzbxi0zwpazsl8fmkvn";
+  sgr-iosevka-ss10 = "1zg170qn0qyqqf2f8ascysnmry7xapp7c1hn7l53vabdb9x2dw26";
+  sgr-iosevka-ss11 = "0wxqwqna2bxzcfdxcq7sdl3rw14lch4kpdy641s6frxvvb1ki0pc";
+  sgr-iosevka-ss12 = "1p50mqxykb9q3cszlswjsgdaml9wagnkq111lbl6v1bjpn72cmd6";
+  sgr-iosevka-ss13 = "1rj81w0ljgi34sx0hzg2np62wlhv628msk92sknqy7nb29ddz56z";
+  sgr-iosevka-ss14 = "0lgvh4njc8zhl7b7ybzcn4h7n89da4cjyfzi80jqnvsrchwfbsr1";
+  sgr-iosevka-ss15 = "15ngz09ax90mf02pf9j6cmr2aqic0kdg5fgsqxdwfhhzczb70j0f";
+  sgr-iosevka-ss16 = "1d6wkhkfivyzn806lk359yj8brcip69a2r02vlzr0h5k6zphfaxb";
+  sgr-iosevka-ss17 = "18vb87rxm40snwagfdgqff1gnlgdq0w921kan0flnrq6cy8h2v5m";
+  sgr-iosevka-ss18 = "0h76169821d4qxkh49p8f1cd8zm3bx0xmnspwf18a38n1f6jk2hi";
+  sgr-iosevka-term = "1qg4c95gf2flacc4zplglb3ygcl2gbzwgd49yivz0l0riq816hws";
+  sgr-iosevka-term-curly = "099lj37032fly1h9spk45f41gmjny8nyrhmxkni3cjmxsldxqphc";
+  sgr-iosevka-term-curly-slab = "11grvy0ff9hn0hazjldzkd1dvzphs53snlvx2fgg8xjrr2b8l6fw";
+  sgr-iosevka-term-slab = "011h29r8h5fjxv4yf99pja2lapdn546mqgpf0535iv8kck830451";
+  sgr-iosevka-term-ss01 = "1049089mzw33czjk36clhvmb5lv53iw9qvs192a3jhizxa2gj17y";
+  sgr-iosevka-term-ss02 = "1vzh14l64spqwm4wznnmlr1p01d9xspk0wsp2nd3kqn3ydrzwxc2";
+  sgr-iosevka-term-ss03 = "1w63jckv0s60lx036rl1k4pmxvnphfasid5mng1g0fm1mac8qn49";
+  sgr-iosevka-term-ss04 = "03xg9f4pxf5xbdlirmw6fwig84ir2p2cc2nh41s8gg9yv5z4xhqv";
+  sgr-iosevka-term-ss05 = "08cq9k25wzkqdxjzjhxgpi6qk0awwcj7f0vz7ykkklkmd1qjjaqc";
+  sgr-iosevka-term-ss06 = "0gba1mpxy3wyzbmgfrrgb2cpzlwrhixgy4475q81anp810v49jha";
+  sgr-iosevka-term-ss07 = "0frhjqhl32ny95i5nkhwil543l1bk0rb912qigzg1gv9ji7ngmpk";
+  sgr-iosevka-term-ss08 = "0kb4vbl36saylvm53i09zkzz2vkipqsyn8kv2aly3yz8i2vxx9sg";
+  sgr-iosevka-term-ss09 = "1jxdwpp0g2c13hc68i2nnmpd84ci5sg71dm1dnwfs44xf2zspn1y";
+  sgr-iosevka-term-ss10 = "0mjy40hhrbb1s5bg70yxzyqppyl50lps3l6gjjjb7c6h3hzs0hyk";
+  sgr-iosevka-term-ss11 = "19wkwpws6hbwvwhbbj4jxs51026qmv5iikfaqhzp6hq4gdhafarb";
+  sgr-iosevka-term-ss12 = "1sz9937n6h896c2nvhnkwchjylw3kn0ywq97n4ksfiw5ziamz6d0";
+  sgr-iosevka-term-ss13 = "13fk86078ljwz3prb1rj43g4mgc8j3mf5ccl4ghaa2dgik7sln27";
+  sgr-iosevka-term-ss14 = "1jc4nmmv2dwp04ihfq9y97kbgnishrn81183ar4wqn9076qifjvi";
+  sgr-iosevka-term-ss15 = "1kl8am9874zi3r2f1hkxx63dq60922cq982c5r9a07fr44cpmapm";
+  sgr-iosevka-term-ss16 = "072ak17fx1gpd3mz1bg7rhgp4bb32i3p71jrmnpf1h0v6xmnbgwa";
+  sgr-iosevka-term-ss17 = "13fbvmjjicv7s54x7q7kmccs10mangrply1257d58cc0jhmgqnyg";
+  sgr-iosevka-term-ss18 = "0dspz5d0jm7d3iqxkx5hc5lf53i84iv6iajvaxdbsiwvvdv1fh8s";
 }
--- a/pkgs/data/icons/kora-icon-theme/default.nix
+++ b/pkgs/data/icons/kora-icon-theme/default.nix
@ -10,13 +10,13 @@

 stdenvNoCC.mkDerivation rec  {
  pname = "kora-icon-theme";
-  version = "1.5.4";
+  version = "1.5.6";

  src = fetchFromGitHub  {
    owner = "bikass";
    repo = "kora";
    rev = "v${version}";
-    sha256 = "sha256-LYlrLkMArF3rRVrvQNNfMdOgW6bJOjK9fE9obXEJK4w=";
+    sha256 = "sha256-vAeml+upESUVlJ95Rm0+vlZ+NQZWEZl00scDkb3W7Yo=";
  };

  nativeBuildInputs = [
--- 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 = "202303160048";
+  version = "202303230043";

  src = fetchFromGitHub {
    owner = "v2fly";
    repo = "geoip";
-    rev = "ca1a04c113293b00434d9d60e24aee17e660f4a6";
-    sha256 = "sha256-YhFYrVN6ZQQeuM8ZCeFRmID/NTsI75oe4c51lOfb18s=";
+    rev = "163f6f7caad67d43b51a9c342a72e34feeccb4d0";
+    sha256 = "sha256-hwKRwCu/LHbjqzgpwG8YcTX4C+eEkonCDqVq36FIprQ=";
  };

  installPhase = ''
--- a/pkgs/desktops/gnustep/make/builder.sh
+++ b/pkgs/desktops/gnustep/make/builder.sh
@ -1,7 +1,11 @@
 if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup

+providedPreConfigure="$preConfigure";
+
 preConfigure() {
+    eval "$providedPreConfigure"
+
    . $GNUSTEP_MAKEFILES/GNUstep.sh
 }

--- a/pkgs/desktops/gnustep/projectcenter/default.nix
+++ b/pkgs/desktops/gnustep/projectcenter/default.nix
@ -1,15 +1,19 @@
-{ fetchurl
+{ lib, fetchFromGitHub
 , base, back, gsmakeDerivation, gui, gorm
 , gnumake, gdb
 }:
 let
-  version = "0.6.2";
+  version = "0.7.0";
 in
 gsmakeDerivation {
-  name = "projectcenter-${version}";
-  src = fetchurl {
-    url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/ProjectCenter-${version}.tar.gz";
-    sha256 = "0wwlbpqf541apw192jb633d634zkpjhcrrkd1j80y9hihphll465";
+  pname = "projectcenter";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "gnustep";
+    repo = "apps-projectcenter";
+    rev = "projectcenter-${lib.replaceStrings [ "." ] [ "_" ] version}";
+    hash = "sha256-uXT2UUvMZNc6Fqi2BUXQimbZk8b3IqXzB+A2btBOmms=";
  };

  # NOTE: need a patch for ProjectCenter to help it locate some necessary tools:
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@ -13,11 +13,11 @@

 stdenv.mkDerivation rec {
  pname = "mate-desktop";
-  version = "1.26.0";
+  version = "1.26.1";

  src = fetchurl {
    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "18sj8smf0b998m5qvki37hxg0agcx7wmgz9z7cwv6v48i2dnnz2z";
+    sha256 = "EtFmiiesGr1gk1OB0/OYIbuAhGenuKz570WIXXyAohE=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/mate/mate-polkit/default.nix
+++ b/pkgs/desktops/mate/mate-polkit/default.nix
@ -13,11 +13,11 @@

 stdenv.mkDerivation rec {
  pname = "mate-polkit";
-  version = "1.26.0";
+  version = "1.26.1";

  src = fetchurl {
    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0kkjv025l1l8352m5ky1g7hmk7isgi3dnfnh7sqg9pyhml97i9dd";
+    sha256 = "9bewtd/FMwLEBAMkWZjrkSGvP1DnFmagmrc7slRSA1c=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/compilers/llvm/rocm/llvm.nix
+++ b/pkgs/development/compilers/llvm/rocm/llvm.nix
@ -48,7 +48,7 @@ let
    else throw "Unsupported ROCm LLVM platform";
 in stdenv.mkDerivation (finalAttrs: {
  pname = "rocm-llvm-${targetName}";
-  version = "5.4.3";
+  version = "5.4.4";

  outputs = [
    "out"
--- a/pkgs/development/compilers/tvm/default.nix
+++ b/pkgs/development/compilers/tvm/default.nix
@ -2,14 +2,14 @@

 stdenv.mkDerivation rec {
  pname = "tvm";
-  version = "0.11.0";
+  version = "0.11.1";

  src = fetchFromGitHub {
    owner = "apache";
    repo = "incubator-tvm";
    rev = "v${version}";
    fetchSubmodules = true;
-    sha256 = "sha256-feFOmpbC2lN3oH7NiCK9mCjBKTfjpI3JqLNad9MUk9A=";
+    sha256 = "sha256-D6j5KHx7I9UmcI6SSuDMYQE/4ae9ZfDef1bdIzryefk=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/interpreters/gauche/default.nix
+++ b/pkgs/development/interpreters/gauche/default.nix
@ -45,6 +45,5 @@ stdenv.mkDerivation rec {
    maintainers = with maintainers; [ mnacamura ];
    license = licenses.bsd3;
    platforms = platforms.unix;
-    broken = stdenv.isDarwin;
  };
 }
--- a/pkgs/development/libraries/expected-lite/default.nix
+++ b/pkgs/development/libraries/expected-lite/default.nix
@ -7,13 +7,13 @@

 stdenv.mkDerivation rec {
  pname = "expected-lite";
-  version = "0.6.2";
+  version = "0.6.3";

  src = fetchFromGitHub {
    owner = "martinmoene";
    repo = "expected-lite";
    rev = "v${version}";
-    hash = "sha256-d3lFpi62QPZKVt/QeBV7MoH3QltSg5dsUI3dIUArPpA=";
+    hash = "sha256-Qvu/YmkivfXVGM4ZPLVt3XmOEnKWcmHpbb9xJyC2qDQ=";
  };

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

 stdenv.mkDerivation rec{
  pname = "gloox";
-  version = "1.0.24";
+  version = "1.0.26";

  src = fetchurl {
    url = "https://camaya.net/download/gloox-${version}.tar.bz2";
-    sha256 = "1jgrd07qr9jvbb5hcmhrqz4w4lvwc51m30jls1fgxf1f5az6455f";
+    sha256 = "sha256-a0WzkNOwNGo89swRjVzK/N8Q1RvlegKwB27fBkAzq28=";
  };

  # needed since gcc12
--- a/pkgs/development/libraries/java/jflex/default.nix
+++ b/pkgs/development/libraries/java/jflex/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "jflex";
-  version = "1.8.2";
+  version = "1.9.1";

  src = fetchurl {
    url = "http://jflex.de/release/jflex-${version}.tar.gz";
-    sha256 = "1ar7g6zb2xjgnws3j4cqcp86jplhc9av8cpcjdmxw08x6igd5q51";
+    sha256 = "sha256-4MHp7vkf9t8E1z+l6v8T86ArZ5/uFHTlzK4AciTfbfY=";
  };

  sourceRoot = "${pname}-${version}";
--- a/pkgs/development/libraries/libcutl/default.nix
+++ b/pkgs/development/libraries/libcutl/default.nix
@ -1,5 +1,8 @@
-{ lib, stdenv, fetchurl, xercesc }:
+{ lib, gccStdenv, fetchurl, xercesc }:

+let
+  stdenv = gccStdenv;
+in
 stdenv.mkDerivation rec {
  pname = "libcutl";
  version = "1.10.0";
@ -14,7 +17,6 @@ stdenv.mkDerivation rec {
    homepage = "https://codesynthesis.com/projects/libcutl/";
    changelog = "https://git.codesynthesis.com/cgit/libcutl/libcutl/plain/NEWS?h=${version}";
    platforms = platforms.all;
-    broken = stdenv.isDarwin;
    maintainers = with maintainers; [ ];
    license = licenses.mit;
  };
--- a/pkgs/development/libraries/libffcall/default.nix
+++ b/pkgs/development/libraries/libffcall/default.nix
@ -24,7 +24,5 @@ stdenv.mkDerivation rec {
    homepage = "https://www.gnu.org/software/libffcall/";
    license = licenses.gpl2Plus;
    platforms = platforms.unix;
-    # never built on aarch64-darwin since first introduction in nixpkgs
-    broken = stdenv.isDarwin && stdenv.isAarch64;
  };
 }
--- a/pkgs/development/libraries/libgbinder/default.nix
+++ b/pkgs/development/libraries/libgbinder/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "libgbinder";
-  version = "1.1.32";
+  version = "1.1.33";

  src = fetchFromGitHub {
    owner = "mer-hybris";
    repo = pname;
    rev = version;
-    sha256 = "sha256-/sOshlPcqKEdH5muusXg6Q9QfSgRYyCJMmtRM5mT/kQ=";
+    sha256 = "sha256-tVvW7cbgj2t251SzUchfVEnHgLVgdkTLyGpQfn6VYow=";
  };

  outputs = [ "out" "dev" ];
--- a/pkgs/development/libraries/librep/default.nix
+++ b/pkgs/development/libraries/librep/default.nix
@ -31,6 +31,9 @@ stdenv.mkDerivation rec {
    readline
  ];

+  # ensure libsystem/ctype functions don't get duplicated when using clang
+  configureFlags = lib.optionals stdenv.isDarwin [ "CFLAGS=-std=gnu89" ];
+
  setupHook = ./setup-hook.sh;

  meta = with lib;{
@ -44,7 +47,6 @@ stdenv.mkDerivation rec {
    license = licenses.gpl2Plus;
    maintainers = [ maintainers.AndersonTorres ];
    platforms = platforms.unix;
-    broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/librep.x86_64-darwin
  };
 }
 # TODO: investigate fetchFromGithub
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@ -38,7 +38,6 @@ in stdenv.mkDerivation rec {
  # https://github.com/TokTok/c-toxcore/issues/2334

  meta = with lib; {
-    broken = stdenv.isDarwin;
    description = "P2P FOSS instant messaging application aimed to replace Skype";
    homepage = "https://tox.chat";
    license = licenses.gpl3Plus;
--- a/pkgs/development/libraries/libyang/default.nix
+++ b/pkgs/development/libraries/libyang/default.nix
@ -15,13 +15,13 @@

 stdenv.mkDerivation rec {
  pname = "libyang";
-  version = "2.1.30";
+  version = "2.1.55";

  src = fetchFromGitHub {
    owner = "CESNET";
    repo = "libyang";
    rev = "v${version}";
-    sha256 = "sha256-EtAm6VbxTDNOEna5zCnGW23CPWlAxe4LpWwXmLPvo/Y=";
+    sha256 = "sha256-fNVhsZPjqdMOmESy/MinjdaNE5jWMWSeVidAs9JGV38=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/muparserx/default.nix
+++ b/pkgs/development/libraries/muparserx/default.nix
@ -38,7 +38,5 @@ stdenv.mkDerivation rec {
    homepage = "https://beltoforion.de/en/muparserx/";
    license = licenses.bsd2;
    maintainers = with maintainers; [ drewrisinger ];
-    # selftest fails
-    broken = stdenv.isDarwin;
  };
 }
--- a/pkgs/development/libraries/mygui/default.nix
+++ b/pkgs/development/libraries/mygui/default.nix
@ -20,13 +20,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "mygui";
-  version = "3.4.0";
+  version = "3.4.1";

  src = fetchFromGitHub {
    owner = "MyGUI";
    repo = "mygui";
    rev = "MyGUI${version}";
-    sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w";
+    hash = "sha256-5u9whibYKPj8tCuhdLOhL4nDisbFAB0NxxdjU/8izb8=";
  };

  patches = [
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    homepage = "http://mygui.info/";
    description = "Library for creating GUIs for games and 3D applications";
-    license = licenses.lgpl3Plus;
+    license = licenses.mit;
    platforms = platforms.unix;
  };
 }
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "rivet";
-  version = "3.1.6";
+  version = "3.1.7";

  src = fetchurl {
    url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
-    hash = "sha256-HPbrtqedGBxEHR0MfG1iPEI4F8YQk/NvIa2q4j5nkJA=";
+    hash = "sha256-J8fbvLX9fugcrxNtr06WC8oOwlXZ+hq+YC9NQwhhsno=";
  };

  latex = texlive.combine { inherit (texlive)
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@ -18,6 +18,7 @@ Check for any minor version changes.
 , developerBuild ? false
 , decryptSslTraffic ? false
 , debug ? false
+, config
 }:

 let
@ -119,9 +120,6 @@ let
      callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; };
    in {

-      # remove before 23.11
-      overrideScope' = lib.warn "qt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope;
-
      inherit callPackage qtCompatVersion qtModule srcs;

      mkDerivationWith =
@ -226,6 +224,9 @@ let
        propagatedBuildInputs = [ self.qtbase.dev buildPackages.makeWrapper ]
          ++ lib.optional stdenv.isLinux self.qtwayland.dev;
      } ../hooks/wrap-qt-apps-hook.sh;
+    } // lib.optionalAttrs config.allowAliases {
+      # remove before 23.11
+      overrideScope' = lib.warn "qt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope;
    };

 in makeScopeWithSplicing (generateSplicesForMkScope "qt5") (_: {}) (_: {}) addPackages
--- a/pkgs/development/libraries/rocclr/default.nix
+++ b/pkgs/development/libraries/rocclr/default.nix
@ -8,7 +8,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rocclr";
-  version = "5.4.3";
+  version = "5.4.4";

  src = fetchFromGitHub {
    owner = "ROCm-Developer-Tools";
--- a/pkgs/development/libraries/rocm-device-libs/default.nix
+++ b/pkgs/development/libraries/rocm-device-libs/default.nix
@ -14,7 +14,7 @@ let
    else throw "Unsupported ROCm LLVM platform";
 in stdenv.mkDerivation (finalAttrs: {
  pname = "rocm-device-libs";
-  version = "5.4.3";
+  version = "5.4.4";

  src = fetchFromGitHub {
    owner = "RadeonOpenCompute";
--- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix
+++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix
@ -14,7 +14,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rocm-opencl-runtime";
-  version = "5.4.3";
+  version = "5.4.4";

  src = fetchFromGitHub {
    owner = "RadeonOpenCompute";
--- a/pkgs/development/libraries/science/math/or-tools/default.nix
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@ -39,6 +39,12 @@ stdenv.mkDerivation rec {
      url = "https://github.com/google/or-tools/commit/a26602f24781e7bfcc39612568aa9f4010bb9736.patch";
      hash = "sha256-gM0rW0xRXMYaCwltPK0ih5mdo3HtX6mKltJDHe4gbLc=";
    })
+    # Backport fix in cmake test configuration where pip installs newer version from PyPi over local build,
+    #  breaking checkPhase: https://github.com/google/or-tools/issues/3260
+    (fetchpatch {
+      url = "https://github.com/google/or-tools/commit/edd1544375bd55f79168db315151a48faa548fa0.patch";
+      hash = "sha256-S//1YM3IoRCp3Ghg8zMF0XXgIpVmaw4gH8cVb9eUbqM=";
+    })
  ];

  cmakeFlags = [
@ -48,7 +54,7 @@ stdenv.mkDerivation rec {
    "-DFETCH_PYTHON_DEPS=OFF"
    "-DUSE_GLPK=ON"
    "-DUSE_SCIP=OFF"
-  ];
+  ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_MACOSX_RPATH=OFF" ];
  nativeBuildInputs = [
    cmake
    ensureNewerSourcesForZipFilesHook
@ -104,6 +110,6 @@ stdenv.mkDerivation rec {
      Google's software suite for combinatorial optimization.
    '';
    maintainers = with maintainers; [ andersk ];
-    platforms = with platforms; linux;
+    platforms = with platforms; linux ++ darwin;
  };
 }
--- a/pkgs/development/libraries/zlib-ng/default.nix
+++ b/pkgs/development/libraries/zlib-ng/default.nix
@ -5,13 +5,13 @@

 stdenv.mkDerivation rec {
  pname = "zlib-ng";
-  version = "2.0.6";
+  version = "2.0.7";

  src = fetchFromGitHub {
    owner = "zlib-ng";
    repo = "zlib-ng";
    rev = version;
-    sha256 = "sha256-8siO8NY+hIkYmumqglirh7HulRIyWSwsyGkAbHSFuhw=";
+    sha256 = "sha256-Q+u71XXfHafmTL8tmk4XcgpbSdBIunveL9Q78LqiZF0=";
  };

  outputs = [ "out" "dev" "bin" ];
--- a/pkgs/development/ocaml-modules/digestif/default.nix
+++ b/pkgs/development/ocaml-modules/digestif/default.nix
@ -1,22 +1,20 @@
 { lib, ocaml, fetchurl, buildDunePackage
-, pkg-config, which
 , eqaf
 , alcotest, astring, bos, findlib, fpath
 }:

 buildDunePackage rec {
  pname = "digestif";
-  version = "1.1.2";
+  version = "1.1.4";

  minimalOCamlVersion = "4.08";
+  duneVersion = "3";

  src = fetchurl {
    url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-${version}.tbz";
-    sha256 = "sha256-edNM5ROxFIV+OAqr328UcyGPGwXdflHQOJB3ntAbRmY=";
+    hash = "sha256-w3k+cg8NqAVPYobFRcghp/6+iC5/TlSX7ImxWjU1EeE=";
  };

-  nativeBuildInputs = [ findlib which ocaml pkg-config ];
-
  propagatedBuildInputs = [ eqaf ];

  checkInputs = [ alcotest astring bos fpath ];
--- a/pkgs/development/ocaml-modules/tezos-base58/default.nix
+++ b/pkgs/development/ocaml-modules/tezos-base58/default.nix
@ -12,6 +12,7 @@ buildDunePackage rec {
  };

  minimalOCamlVersion = "4.08";
+  duneVersion = "3";

  propagatedBuildInputs = [
    zarith digestif fmt
--- a/pkgs/development/python-modules/aioharmony/default.nix
+++ b/pkgs/development/python-modules/aioharmony/default.nix
@ -9,13 +9,13 @@

 buildPythonPackage rec {
  pname = "aioharmony";
-  version = "0.2.9";
+  version = "0.2.10";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-T30pLzPWD+5pb0ShkpNdiBFO45RdiMYgCOSg8rx+t+Y=";
+    hash = "sha256-18+38QunEdEGdirQOT+528vYqiqDuUr/CWRQtXKf4rs=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/aioopenexchangerates/default.nix
+++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "aioopenexchangerates";
-  version = "0.4.1";
+  version = "0.4.2";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "MartinHjelmare";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-JS134qjK2pT6KLD+91EmrA3HCNmF8DWcq71E/k9ULSA=";
+    hash = "sha256-Ykbw/s932XXX3qWutWUOLV1O9MMgBWPJNveKG8SDhWY=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/aiortm/default.nix
+++ b/pkgs/development/python-modules/aiortm/default.nix
@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "aiortm";
-  version = "0.6.2";
+  version = "0.6.3";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "MartinHjelmare";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-pfBJ5LWsG3HUGQF2IPMbVKv99xg+dqt17B8unmuv/Ww=";
+    hash = "sha256-9Ny1Xby2e1lyrDTZLd6UVASx8/kwjsq4ogMTSKryQqg=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/asf-search/default.nix
+++ b/pkgs/development/python-modules/asf-search/default.nix
@ -9,7 +9,6 @@
 , importlib-metadata
 , numpy
 , dateparser
-, jinja2
 , remotezip
 , pytestCheckHook
 , requests-mock
@ -18,7 +17,7 @@

 buildPythonPackage rec {
  pname = "asf-search";
-  version = "6.1.0";
+  version = "6.2.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -27,7 +26,7 @@ buildPythonPackage rec {
    owner = "asfadmin";
    repo = "Discovery-asf_search";
    rev = "refs/tags/v${version}";
-    hash = "sha256-3CnarUqW7/hEo4zvRGLJ+VAY5X+aacBdY1Epef523vY=";
+    hash = "sha256-4RFGhA9xzc1kxSni6rAbevoDkc1bLdQD1II/2xq/uKM=";
  };

  propagatedBuildInputs = [
@ -38,7 +37,6 @@ buildPythonPackage rec {
    importlib-metadata
    numpy
    dateparser
-    jinja2
    remotezip
  ];

@ -56,6 +54,7 @@ buildPythonPackage rec {
  ];

  meta = with lib; {
+    changelog = "https://github.com/asfadmin/Discovery-asf_search/blob/${src.rev}/CHANGELOG.md";
    description = "Python wrapper for the ASF SearchAPI";
    homepage = "https://github.com/asfadmin/Discovery-asf_search";
    license = licenses.bsd3;
--- a/pkgs/development/python-modules/asyncstdlib/default.nix
+++ b/pkgs/development/python-modules/asyncstdlib/default.nix
@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "asyncstdlib";
-  version = "3.10.5";
+  version = "3.10.6";
  format = "flit";

  disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "maxfischer2781";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-ILb+iWg2xYWBEQY1a4jPITm4QCPO8qfVCPgO3YWIVAQ=";
+    hash = "sha256-JfKcmmusFmMckYc2+EBItt5V6o4Dk+foIv5hb7wMsHs=";
  };

  propagatedBuildInputs = [
@ -35,6 +35,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Python library that extends the Python asyncio standard library";
    homepage = "https://asyncstdlib.readthedocs.io/";
+    changelog = "https://github.com/maxfischer2781/asyncstdlib/releases/tag/v${version}";
    license = with licenses; [ mit ];
    maintainers = with maintainers; [ fab ];
  };
--- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix
+++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "azure-keyvault-keys";
-  version = "4.7.0";
+  version = "4.8.0";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    inherit pname version;
    extension = "zip";
-    hash = "sha256-9jdA9dwNmxQtitZZCfSoSe9UmiDobf8uwyLBPeBILYw=";
+    hash = "sha256-bAuy94MgKjSj5ex0hm5iEuWRrHEk8DuWadGwm2giS8Q=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/bluetooth-adapters/default.nix
+++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "bluetooth-adapters";
-  version = "0.15.2";
+  version = "0.15.3";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "Bluetooth-Devices";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-vwcOMg10XRT6wNkQQF6qkbWSG2rsUXaDSEiIevii1eA=";
+    hash = "sha256-sh5wOx/4J1AEzR5zrd77v7Cbq6Mt9vOjCSREKHRN4aQ=";
  };

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

 buildPythonPackage rec {
  pname = "dash";
-  version = "2.8.1";
+  version = "2.9.1";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@ -30,7 +30,7 @@ buildPythonPackage rec {
    owner = "plotly";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-6FsLvLsqnkSt/i27q/JJGfNh2zxKeA0t6VYNPCzhR0w=";
+    hash = "sha256-bxWSYDKKnsWs/bTRkIsNJ2hOIoHS2xhl4IIW+uEnbMU=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/dateparser/default.nix
+++ b/pkgs/development/python-modules/dateparser/default.nix
@ -21,7 +21,7 @@

 buildPythonPackage rec {
  pname = "dateparser";
-  version = "1.1.7";
+  version = "1.1.8";

  disabled = pythonOlder "3.7";

@ -31,7 +31,7 @@ buildPythonPackage rec {
    owner = "scrapinghub";
    repo = "dateparser";
    rev = "refs/tags/v${version}";
-    hash = "sha256-KQCjXuBDBZduNYJITwk1qx7mBp8CJ95ZbFlhrFMkE8w=";
+    hash = "sha256-52g8defF5bsisBv2QoyUymXcf0sljOI9PjeR4l0Pw6k=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/gpaw/default.nix
+++ b/pkgs/development/python-modules/gpaw/default.nix
@ -13,6 +13,7 @@
 , ase
 , numpy
 , scipy
+, pyyaml
 }:

 assert lib.asserts.assertMsg (!blas.isILP64)
@ -85,7 +86,7 @@ in buildPythonPackage rec {

  buildInputs = [ blas scalapack libxc libvdwxc ];

-  propagatedBuildInputs = [ ase scipy numpy mpi ];
+  propagatedBuildInputs = [ ase scipy numpy mpi pyyaml ];

  patches = [ ./SetupPath.patch ];

--- a/pkgs/development/python-modules/laspy/default.nix
+++ b/pkgs/development/python-modules/laspy/default.nix
@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, numpy
+, laszip
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "laspy";
+  version = "2.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-Wdbp6kjuZkJh+pp9OVczdsRNgn41/Tdt7nGFvewcQ1w=";
+  };
+
+  propagatedBuildInputs = [
+    numpy
+    laszip
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "laspy" "laszip" ];
+
+  meta = with lib; {
+    description = "Interface for reading/modifying/creating .LAS LIDAR files";
+    homepage = "https://github.com/laspy/laspy";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ matthewcroughan ];
+  };
+}
--- a/pkgs/development/python-modules/laszip/default.nix
+++ b/pkgs/development/python-modules/laszip/default.nix
@ -0,0 +1,58 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, scikit-build-core
+, distlib
+, pytestCheckHook
+, pyproject-metadata
+, pathspec
+, pybind11
+, cmake
+, LASzip
+}:
+
+buildPythonPackage rec {
+  pname = "laszip-python";
+  version = "0.2.1";
+
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "tmontaigu";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-ujKoUm2Btu25T7ZrSGqjRc3NR1qqsQU8OwHQDSx8grY=";
+  };
+
+  nativeBuildInputs = [
+    scikit-build-core
+    scikit-build-core.optional-dependencies.pyproject
+    cmake
+  ];
+
+  buildInputs = [
+    pybind11
+    LASzip
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  preBuild = ''
+    cd ..
+  '';
+
+  # There are no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "laszip" ];
+
+  meta = with lib; {
+    description = "Unofficial bindings between Python and LASzip made using pybind11";
+    homepage = "https://github.com/tmontaigu/laszip-python";
+    license = licenses.mit;
+    maintainers = with maintainers; [ matthewcroughan ];
+  };
+}
+
--- a/pkgs/development/python-modules/peaqevcore/default.nix
+++ b/pkgs/development/python-modules/peaqevcore/default.nix
@ -6,14 +6,14 @@

 buildPythonPackage rec {
  pname = "peaqevcore";
-  version = "13.4.0";
+  version = "13.4.1";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-USDqlZZ8w4A2KC4xGVCkgEuMxGK8ez5+/M6nSe3/46c=";
+    hash = "sha256-f4Xq68QBcnHZdwZrAwg7QUvZrXYvrflEkh1us48YN/g=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/pnglatex/default.nix
+++ b/pkgs/development/python-modules/pnglatex/default.nix
@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchPypi, poppler_utils, netpbm }:
+
+buildPythonPackage rec {
+
+  pname = "pnglatex";
+  version = "1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-CZUGDUkmttO0BzFYbGFSNMPkWzFC/BW4NmAeOwz4Y9M=";
+  };
+
+  propagatedBuildInputs = [
+    poppler_utils
+    netpbm
+  ];
+
+  # There are no tests
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = "https://github.com/MaT1g3R/pnglatex";
+    description = "a small program that converts LaTeX snippets to png";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ GaetanLepage ];
+  };
+}
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@ -17,16 +17,16 @@

 buildPythonPackage rec {
  pname = "pontos";
-  version = "23.3.5";
+  version = "23.3.6";
  format = "pyproject";

-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";

  src = fetchFromGitHub {
    owner = "greenbone";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-Eb9mX04ws+FhiRw5j1XsEhjm5ZdYFCbA5pntgb4z//M=";
+    hash = "sha256-cs+UeE5QRL/yzFABpMQ4masbLHwG++Ipu5GidXJ1Y0E=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/pygments/default.nix
+++ b/pkgs/development/python-modules/pygments/default.nix
@ -44,6 +44,7 @@ let pygments = buildPythonPackage
    meta = with lib; {
      homepage = "https://pygments.org/";
      description = "A generic syntax highlighter";
+      mainProgram = "pygmentize";
      license = licenses.bsd2;
      maintainers = with maintainers; [ SuperSandro2000 ];
    };
--- a/pkgs/development/python-modules/pyswitchbot/default.nix
+++ b/pkgs/development/python-modules/pyswitchbot/default.nix
@ -1,10 +1,12 @@
 { lib
+, async-timeout
 , bleak
 , bleak-retry-connector
 , boto3
 , buildPythonPackage
 , cryptography
 , fetchFromGitHub
+, pyopenssl
 , pythonOlder
 , pytestCheckHook
 , requests
@ -12,7 +14,7 @@

 buildPythonPackage rec {
  pname = "pyswitchbot";
-  version = "0.37.3";
+  version = "0.37.4";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -21,14 +23,16 @@ buildPythonPackage rec {
    owner = "Danielhiversen";
    repo = "pySwitchbot";
    rev = "refs/tags/${version}";
-    hash = "sha256-0Kzzyzlxs5PaEHKzJLsconUg4zmgPzWI8LD5UIcKwEY=";
+    hash = "sha256-2P7hj0kfKLPyuKk6ouHJtkWCUT3EC1spQTjBQarwpbU=";
  };

  propagatedBuildInputs = [
+    async-timeout
    bleak
    bleak-retry-connector
    boto3
    cryptography
+    pyopenssl
    requests
  ];

--- a/Show more
+++ b/Show more