Merge staging-next into staging

2023-09-07 00:02:49 +00:00
parent fa3a4a18c0 321c1cb530
commit 204bfce523
113 changed files with 1029 additions and 21919 deletions
@@ -101,6 +101,10 @@
 /nixos/lib/systemd-*.nix                    @NixOS/systemd
 /pkgs/os-specific/linux/systemd             @NixOS/systemd

+# Images and installer media
+/nixos/modules/installer/cd-dvd/            @samueldr
+/nixos/modules/installer/sd-card/           @samueldr
+
 # Updaters
 ## update.nix
 /maintainers/scripts/update.nix   @jtojnar
@@ -5541,11 +5541,11 @@
    matrix = "@felipeqq2:pub.solar";
  };
  felixalbrigtsen = {
-    email = "felixalbrigtsen@gmail.com";
+    email = "felix@albrigtsen.it";
    github = "felixalbrigtsen";
    githubId = 64613093;
    name = "Felix Albrigtsen";
-    matrix = "@felixalb:pvv.ntnu.no";
+    matrix = "@felixalb:feal.no";
  };
  felixscheinost = {
    name = "Felix Scheinost";
@@ -5738,6 +5738,12 @@
    githubId = 5918766;
    name = "Franz Thoma";
  };
+  fogti = {
+    name = "Alain Fogtia Zscheile";
+    email = "fogti+devel@ytrizja.de";
+    github = "fogti";
+    githubId = 1618343;
+  };
  foo-dogsquared = {
    email = "foo.dogsquared@gmail.com";
    github = "foo-dogsquared";
@@ -15957,6 +15963,15 @@
    github = "syvb";
    githubId = 10530973;
  };
+  smona = {
+    name = "Mel Bourgeois";
+    email = "mason.bourgeois@gmail.com";
+    github = "Smona";
+    githubId = 7091399;
+    keys = [{
+      fingerprint = "897E 6BE3 0345 B43D CADD  05B7 290F CF08 1AED B3EC";
+    }];
+  };
  sna = {
    email = "abouzahra.9@wright.edu";
    github = "S-NA";
@@ -19231,15 +19246,6 @@
    githubId = 8100652;
    name = "David Mell";
  };
-  zseri = {
-    name = "zseri";
-    email = "zseri.devel@ytrizja.de";
-    github = "fogti";
-    githubId = 1618343;
-    keys = [{
-      fingerprint = "7AFB C595 0D3A 77BD B00F  947B 229E 63AE 5644 A96D";
-    }];
-  };
  ztzg = {
    email = "dd@crosstwine.com";
    github = "ztzg";
@@ -24,6 +24,9 @@ let
        # Name appended to menuentry defaults to params if no specific name given.
        option.name or (optionalString (option ? params) "(${option.params})")
        }' ${optionalString (option ? class) " --class ${option.class}"} {
+          # Fallback to UEFI console for boot, efifb sometimes has difficulties.
+          terminal_output console
+
          linux ${defaults.image} \''${isoboot} ${defaults.params} ${
            option.params or ""
          }
@@ -185,33 +188,25 @@ let
      # So instead we'll list a lot of possibly valid modes :/
      #"3840x2160"
      #"2560x1440"
+      "1920x1200"
      "1920x1080"
      "1366x768"
+      "1280x800"
      "1280x720"
+      "1200x1920"
      "1024x768"
+      "800x1280"
      "800x600"
      "auto"
    ]}

-    # Fonts can be loaded?
-    # (This font is assumed to always be provided as a fallback by NixOS)
-    if loadfont (\$root)/EFI/boot/unicode.pf2; then
-      set with_fonts=true
-    fi
-    if [ "\$textmode" != "true" -a "\$with_fonts" == "true" ]; then
-      # Use graphical term, it can be either with background image or a theme.
-      # input is "console", while output is "gfxterm".
-      # This enables "serial" input and output only when possible.
-      # Otherwise the failure mode is to not even enable gfxterm.
-      if test "\$with_serial" == "yes"; then
-        terminal_output gfxterm serial
-        terminal_input  console serial
-      else
-        terminal_output gfxterm
-        terminal_input  console
-      fi
+    if [ "\$textmode" == "false" ]; then
+      terminal_output gfxterm
+      terminal_input  console
    else
-      # Sets colors for the non-graphical term.
+      terminal_output console
+      terminal_input  console
+      # Sets colors for console term.
      set menu_color_normal=cyan/blue
      set menu_color_highlight=white/blue
    fi
@@ -250,18 +245,58 @@ let
    touch $out/EFI/nixos-installer-image

    # ALWAYS required modules.
-    MODULES="fat iso9660 part_gpt part_msdos \
-             normal boot linux configfile loopback chain halt \
-             efifwsetup efi_gop \
-             ls search search_label search_fs_uuid search_fs_file \
-             gfxmenu gfxterm gfxterm_background gfxterm_menu test all_video loadenv \
-             exfat ext2 ntfs btrfs hfsplus udf \
-             videoinfo png \
-             echo serial \
-            "
+    MODULES=(
+      # Basic modules for filesystems and partition schemes
+      "fat"
+      "iso9660"
+      "part_gpt"
+      "part_msdos"
+
+      # Basic stuff
+      "normal"
+      "boot"
+      "linux"
+      "configfile"
+      "loopback"
+      "chain"
+      "halt"
+
+      # Allows rebooting into firmware setup interface
+      "efifwsetup"
+
+      # EFI Graphics Output Protocol
+      "efi_gop"
+
+      # User commands
+      "ls"
+
+      # System commands
+      "search"
+      "search_label"
+      "search_fs_uuid"
+      "search_fs_file"
+      "echo"
+
+      # We're not using it anymore, but we'll leave it in so it can be used
+      # by user, with the console using "C"
+      "serial"
+
+      # Graphical mode stuff
+      "gfxmenu"
+      "gfxterm"
+      "gfxterm_background"
+      "gfxterm_menu"
+      "test"
+      "loadenv"
+      "all_video"
+      "videoinfo"
+
+      # File types for graphical mode
+      "png"
+    )

    echo "Building GRUB with modules:"
-    for mod in $MODULES; do
+    for mod in ''${MODULES[@]}; do
      echo " - $mod"
    done

@@ -270,31 +305,27 @@ let
    for mod in efi_uga; do
      if [ -f ${grubPkgs.grub2_efi}/lib/grub/${grubPkgs.grub2_efi.grubTarget}/$mod.mod ]; then
        echo " - $mod"
-        MODULES+=" $mod"
+        MODULES+=("$mod")
      fi
    done

    # Make our own efi program, we can't rely on "grub-install" since it seems to
    # probe for devices, even with --skip-fs-probe.
-    grub-mkimage --directory=${grubPkgs.grub2_efi}/lib/grub/${grubPkgs.grub2_efi.grubTarget} -o $out/EFI/boot/boot${targetArch}.efi -p /EFI/boot -O ${grubPkgs.grub2_efi.grubTarget} \
-      $MODULES
+    grub-mkimage \
+      --directory=${grubPkgs.grub2_efi}/lib/grub/${grubPkgs.grub2_efi.grubTarget} \
+      -o $out/EFI/boot/boot${targetArch}.efi \
+      -p /EFI/boot \
+      -O ${grubPkgs.grub2_efi.grubTarget} \
+      ''${MODULES[@]}
    cp ${grubPkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/

    cat <<EOF > $out/EFI/boot/grub.cfg

-    set with_fonts=false
-    set textmode=${boolToString (!config.isoImage.graphicalGrub)}
-    # If you want to use serial for "terminal_*" commands, you need to set one up:
-    #   Example manual configuration:
-    #    → serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
-    # This uses the defaults, and makes the serial terminal available.
-    set with_serial=no
-    if serial; then set with_serial=yes ;fi
-    export with_serial
-    clear
+    set textmode=${boolToString (config.isoImage.forceTextMode)}
    set timeout=${toString grubEfiTimeout}

-    # This message will only be viewable when "gfxterm" is not used.
+    clear
+    # This message will only be viewable on the default (UEFI) console.
    echo ""
    echo "Loading graphical boot menu..."
    echo ""
@@ -306,7 +337,7 @@ let
    hiddenentry 'Text mode' --hotkey 't' {
      loadfont (\$root)/EFI/boot/unicode.pf2
      set textmode=true
-      terminal_output gfxterm console
+      terminal_output console
    }
    hiddenentry 'GUI mode' --hotkey 'g' {
      $(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont (\$root)/EFI/boot/grub-theme/%P\n")
@@ -400,6 +431,8 @@ let
    }
    EOF

+    grub-script-check $out/EFI/boot/grub.cfg
+
    ${refind}
  '';

@@ -658,13 +691,17 @@ in
      '';
    };

-    isoImage.graphicalGrub = mkOption {
+    isoImage.forceTextMode = mkOption {
      default = false;
      type = types.bool;
      example = true;
      description = lib.mdDoc ''
-        Whether to use textmode or graphical grub.
-        false means we use textmode grub.
+        Whether to use text mode instead of graphical grub.
+        A value of `true` means graphical mode is not tried to be used.
+
+        This is useful for validating that graphics mode usage is not at the root cause of a problem with the iso image.
+
+        If text mode is required off-handedly (e.g. for serial use) you can use the `T` key, after being prompted, to use text mode for the current boot.
      '';
    };

@@ -15,8 +15,7 @@ in {
        description = lib.mdDoc ''
          Configuration for `auto-cpufreq`.

-          See its [example configuration file] for supported settings.
-          [example configuration file]: https://github.com/AdnanHodzic/auto-cpufreq/blob/master/auto-cpufreq.conf-example
+          The available options can be found in [the example configuration file](https://github.com/AdnanHodzic/auto-cpufreq/blob/v${pkgs.auto-cpufreq.version}/auto-cpufreq.conf-example).
          '';

        default = {};
@@ -35,6 +34,7 @@ in {
        wantedBy = [ "multi-user.target" ];
        path = with pkgs; [ bash coreutils ];

+        serviceConfig.WorkingDirectory = "";
        serviceConfig.ExecStart = [
          ""
          "${lib.getExe pkgs.auto-cpufreq} --daemon --config ${cfgFile}"
@@ -42,4 +42,7 @@ in {
      };
    };
  };
+
+  # uses attributes of the linked package
+  meta.buildDocsInSandbox = false;
 }
@@ -115,9 +115,9 @@ in {
      user = "grocy";
      group = "nginx";

-      # PHP 8.1 is the only version which is supported/tested by upstream:
-      # https://github.com/grocy/grocy/blob/v4.0.0/README.md#platform-support
-      phpPackage = pkgs.php81;
+      # PHP 8.1 and 8.2 are the only version which are supported/tested by upstream:
+      # https://github.com/grocy/grocy/blob/v4.0.2/README.md#platform-support
+      phpPackage = pkgs.php82;

      inherit (cfg.phpfpm) settings;

@@ -130,6 +130,16 @@ in {
      };
    };

+    # After an update of grocy, the viewcache needs to be deleted. Otherwise grocy will not work
+    # https://github.com/grocy/grocy#how-to-update
+    systemd.services.grocy-setup = {
+      wantedBy = [ "multi-user.target" ];
+      before = [ "phpfpm-grocy.service" ];
+      script = ''
+        rm -rf ${cfg.dataDir}/viewcache/*
+      '';
+    };
+
    services.nginx = {
      enable = true;
      virtualHosts."${cfg.hostName}" = mkMerge [
@@ -3,55 +3,79 @@
 , fetchFromGitHub
 , makeWrapper
 , rofi
+, tmux
+, fzf
 , mpc-cli
 , perl
 , util-linux
-, python3Packages
 , libnotify
+, perlPackages
 }:

 stdenv.mkDerivation {
  pname = "clerk";
-  version = "unstable-2016-10-14";
+  version = "unstable-2023-01-14";

  src = fetchFromGitHub {
    owner = "carnager";
    repo = "clerk";
-    rev = "875963bcae095ac1db174627183c76ebe165f787";
-    sha256 = "0y045my65hr3hjyx13jrnyg6g3wb41phqb1m7azc4l6vx6r4124b";
+    rev = "90c0e702fc4f8b65f0ced7b8944c063629e3686d";
+    hash = "sha256-nkm1vJaWgN8gOkmAbsjPfstax8TwUSkEzYKJ1iEz1hM";
  };

+  postPatch = ''
+    substituteInPlace clerk_rating_client.service \
+      --replace "/usr" "$out"
+  '';
+
  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ python3Packages.mpd2 ];
+
+  buildInputs = with perlPackages; [
+    perl
+    DataMessagePack
+    DataSectionSimple
+    ConfigSimple
+    TryTiny
+    IPCRun
+    HTTPDate
+    FileSlurper
+    ArrayUtils
+    NetMPD
+  ];

  dontBuild = true;

  strictDeps = true;

-  installPhase =
-    let
-      binPath = lib.makeBinPath [
-        libnotify
-        mpc-cli
-        perl
-        rofi
-        util-linux
-      ];
-    in
-      ''
-        runHook preInstall
+  installPhase = ''
+    runHook preInstall

-        DESTDIR=$out PREFIX=/ make install
-        wrapProgram $out/bin/clerk --prefix PATH : "${binPath}"
+    install -D clerk.pl $out/bin/clerk
+    install -D clerk_rating_client $out/bin/clerk_rating_client
+    install -D clerk_rating_client.service $out/lib/systemd/user/clerk_rating_client.service
+    runHook postInstall
+  '';

-        runHook postInstall
-      '';
+  postFixup = let
+    binPath = lib.makeBinPath [
+      libnotify
+      mpc-cli
+      rofi
+      tmux
+      fzf
+      util-linux
+    ];
+  in
+  ''
+    wrapProgram $out/bin/clerk --set PERL5LIB $PERL5LIB --prefix PATH : "${binPath}"
+    wrapProgram $out/bin/clerk_rating_client --set PERL5LIB $PERL5LIB --prefix PATH : "${binPath}"
+  '';

  meta = with lib; {
-    description = "An MPD client built on top of rofi";
+    description = "An MPD client based on rofi/fzf";
    homepage = "https://github.com/carnager/clerk";
    license = licenses.mit;
-    broken = true; # not compatible with current version of rofi
-    maintainers = with maintainers; [ anderspapitto ];
+    maintainers = with maintainers; [ anderspapitto rewine ];
+    mainProgram = "clerk";
  };
 }
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
    description = "Mopidy extension for playing music from Tidal";
    homepage = "https://github.com/tehkillerbee/mopidy-tidal";
    license = licenses.mit;
-    maintainers = [ maintainers.rodrgz ];
+    maintainers = [ ];
  };
 }

@@ -1,4 +1,4 @@
-{ lib, fetchurl, appimageTools, }:
+{ lib, fetchurl, appimageTools, makeWrapper }:

 let
  pname = "youtube-music";
@@ -11,13 +11,16 @@ let

  appimageContents = appimageTools.extract { inherit pname version src; };
 in
-appimageTools.wrapType2 rec {
+(appimageTools.wrapType2 rec {
  inherit pname version src;
  extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs)
    ++ [ pkgs.libappindicator ];

  extraInstallCommands = ''
    mv $out/bin/{${pname}-${version},${pname}}
+    wrapProgram "$out/bin/${pname}" \
+       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}"
+
    install -m 444 \
        -D ${appimageContents}/youtube-music.desktop \
        -t $out/share/applications
@@ -36,4 +39,6 @@ appimageTools.wrapType2 rec {
    maintainers = [ maintainers.aacebedo ];
    mainProgram = "youtube-music";
  };
-}
+}).overrideAttrs ({ nativeBuildInputs ? [ ], ... }: {
+  nativeBuildInputs = nativeBuildInputs ++ [ makeWrapper ];
+})
@@ -30,6 +30,7 @@
 , postgresql
 , nodejs
 , mkYarnModules
+, fetchYarnDeps
 , qmake
 , server ? false # build server version
 , sqlite
@@ -64,11 +65,14 @@ let
    sha256 = "sha256-ULyWdSgGPSAwMt0t4QPuzeUE6Bo6IJh+5BMgW1bFN+Y=";
  };

-  panmirrorModules = mkYarnModules {
+  panmirrorModules = mkYarnModules rec {
    inherit pname version;
    packageJSON = ./package.json;
-    yarnLock = ./yarn.lock;
-    yarnNix = ./yarndeps.nix;
+    yarnLock = "${src}/src/gwt/panmirror/src/editor/yarn.lock";
+    offlineCache = fetchYarnDeps {
+      inherit yarnLock;
+      hash = "sha256-v05Up6VMlYlvgUYQVYo+YfpcsMohliNfMgyjq6QymCI=";
+    };
  };

  description = "Set of integrated tools for the R language";
@@ -8,6 +8,7 @@
 , wrapQtAppsHook
 , cmake
 , python3
+, stdenv
 }:

 mkDerivation rec {
@@ -36,15 +37,23 @@ mkDerivation rec {
  ];

  installPhase = ''
+    runHook preInstall
+  '' + lib.optionalString stdenv.isDarwin ''
+    mkdir -p $out/Applications
+    cp -r Ripes.app $out/Applications/
+    makeBinaryWrapper $out/Applications/Ripes.app/Contents/MacOS/Ripes $out/bin/Ripes
+  '' + lib.optionalString stdenv.isLinux ''
    install -D Ripes $out/bin/Ripes
+  '' + ''
    cp -r ${src}/appdir/usr/share $out/share
+    runHook postInstall
  '';

  meta = with lib; {
    description = "A graphical processor simulator and assembly editor for the RISC-V ISA";
    homepage = "https://github.com/mortbopet/Ripes";
    license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    maintainers = with maintainers; [ rewine ];
  };
 }
@@ -8,6 +8,7 @@
 , pkg-config
 , python3
 , SDL2
+, bluez
 , dbus
 , eigen
 , ffmpeg
@@ -28,8 +29,10 @@
 , libuvc
 , libv4l
 , libxcb
+, onnxruntime
 , opencv4
 , openhmd
+, openvr
 , udev
 , vulkan-headers
 , vulkan-loader
@@ -47,14 +50,14 @@

 stdenv.mkDerivation rec {
  pname = "monado";
-  version = "unstable-2023-01-14";
+  version = "unstable-2023-08-22";

  src = fetchFromGitLab {
    domain = "gitlab.freedesktop.org";
    owner = "monado";
    repo = "monado";
-    rev = "1ef49b92f2d6cb519039edd7ba7f70e8073fbe88";
-    sha256 = "sha256-zieJmI6BKHpYyCPOOUora9qoWn+NXehbHKvoi4h81UA=";
+    rev = "4cc68f07c0f3c2fee57b01dde28a02e314d3bee6";
+    sha256 = "sha256-VibdOSA/b4RmwwwXrwhivuiukNK10YazYF/p+YnqRZ8=";
  };

  nativeBuildInputs = [
@@ -72,6 +75,7 @@ stdenv.mkDerivation rec {

  buildInputs = [
    SDL2
+    bluez
    dbus
    eigen
    ffmpeg
@@ -92,8 +96,10 @@ stdenv.mkDerivation rec {
    libuvc
    libv4l
    libxcb
+    onnxruntime
    opencv4
    openhmd
+    openvr
    udev
    vulkan-headers
    vulkan-loader
@@ -104,6 +110,13 @@ stdenv.mkDerivation rec {
    zlib
  ];

+  # known disabled drivers:
+  #  - DRIVER_DEPTHAI - Needs depthai-core https://github.com/luxonis/depthai-core
+  #  - DRIVER_ILLIXR - needs ILLIXR headers https://github.com/ILLIXR/ILLIXR
+  #  - DRIVER_REALSENSE - see below
+  #  - DRIVER_SIMULAVR - needs realsense
+  #  - DRIVER_ULV2 - needs proprietary Leapmotion SDK https://api.leapmotion.com/documentation/v2/unity/devguide/Leap_SDK_Overview.html
+
  # realsense is disabled, the build ends with the following error:
  #
  # CMake Error in src/xrt/drivers/CMakeLists.txt:
@@ -119,6 +132,14 @@ stdenv.mkDerivation rec {
    export XDG_CONFIG_DIRS=@out@/etc/xdg''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}}
  '';

+  patches = [
+    # We don't have $HOME/.steam when building
+    ./force-enable-steamvr_lh.patch
+
+    # A recent (as of August 2023) SteamVR Beta has upgraded a driver interface which is incompatible with Monado
+    ./steamvr_lh-use-old-interface.patch
+  ];
+
  meta = with lib; {
    description = "Open source XR runtime";
    homepage = "https://monado.freedesktop.org/";
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4308d73d..0081d536 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -219,6 +219,7 @@ option(BUILD_TESTING "Enable building of the test suite?" ON)
+ if(EXISTS "$ENV{HOME}/.steam/root")
+ 	set(XRT_HAVE_STEAM YES)
+ endif()
+set(XRT_HAVE_STEAM YES)
+ 
+ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ 	set(XRT_HAVE_INTERNAL_HID ON)
@@ -0,0 +1,13 @@
+diff --git a/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp b/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp
+index 24b69fd..5b3a5ca 100644
+--- a/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp
+++ b/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp
+@@ -138,7 +138,7 @@ Context::setup_hmd(const char *serial, vr::ITrackedDeviceServerDriver *driver)
+ 	vr::EVRInitError err = driver->Activate(0);
+ 	VERIFY(err == vr::VRInitError_None, std::to_string(err).c_str());
+ 
+-	auto *display = static_cast<vr::IVRDisplayComponent *>(driver->GetComponent(vr::IVRDisplayComponent_Version));
+	auto *display = static_cast<vr::IVRDisplayComponent *>(driver->GetComponent("IVRDisplayComponent_003"));
+ 	VERIFY(display, "IVRDisplayComponent is null");
+ #undef VERIFY
+ 
@@ -27,6 +27,6 @@ buildPythonApplication rec {
    description = "Dmenu/Rofi frontend for managing Bitwarden vaults. Uses the Bitwarden CLI tool to interact with the Bitwarden database.";
    homepage = "https://github.com/firecat53/bitwarden-menu";
    license = licenses.mit;
-    maintainers = [ maintainers.rodrgz ];
+    maintainers = [ ];
  };
 }
@@ -8,15 +8,18 @@
 , webkitgtk
 , libappindicator
 , wrapGAppsHook
+, shared-mime-info
+, glib-networking
 }:

 stdenv.mkDerivation rec {
  name = "holochain-launcher";
-  version = "0.9.4";
+  version = "0.11.0";
+  prerelease = "beta-2";

  src = fetchurl {
-    url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb";
-    sha256 = "sha256-qTzm4pwhYbEN96a/Dz/JcJcZ2OobyQJRNC2yH4CbhzQ=";
+    url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher-${prerelease}_${version}_amd64.deb";
+    sha256 = "sha256-yxovSsPyIzFONa1ACeLkZqDCElDI3uTm81YOYW0/FXE=";
  };

  nativeBuildInputs = [
@@ -29,16 +32,25 @@ stdenv.mkDerivation rec {
    openssl
    webkitgtk
    libappindicator
+
+    glib-networking
  ];

  unpackCmd = "dpkg-deb -x $curSrc source";

  installPhase = ''
    mv usr $out
+    mv $out/bin/holochain-launcher-${prerelease} $out/bin/holochain-launcher
  '';

  preFixup = ''
    patchelf --add-needed "libappindicator3.so" "$out/bin/holochain-launcher"
+
+    # without this the DevTools will just display an unparsed HTML file (see https://github.com/tauri-apps/tauri/issues/5711#issuecomment-1336409601)
+    gappsWrapperArgs+=(
+      --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
+      --set WEBKIT_DISABLE_COMPOSITING_MODE 1
+    )
  '';

  meta = with lib; {
@@ -1,5 +1,6 @@
 { lib
 , fetchFromGitHub
+, fetchYarnDeps
 , makeWrapper
 , makeDesktopItem
 , copyDesktopItems
@@ -19,8 +20,11 @@ mkYarnPackage rec {
  };

  packageJSON = ./package.json;
-  yarnLock = ./yarn.lock;
-  yarnNix = ./yarn.nix;
+
+  offlineCache = fetchYarnDeps {
+    yarnLock = "${src}/yarn.lock";
+    hash = "sha256-GTiNv7u1QK/wjQgpka7REuoLn2wjZG59kYJQaZZPycI=";
+  };

  ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

@@ -1,4 +1,11 @@
-{ lib, buildGoModule, fetchFromGitHub, pkg-config, gtk3, gtk-layer-shell }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, librsvg
+, pkg-config
+, gtk3
+, gtk-layer-shell
+, wrapGAppsHook }:

 buildGoModule rec {
  pname = "nwg-bar";
@@ -19,9 +26,9 @@ buildGoModule rec {

  vendorHash = "sha256-mqcXhnja8ed7vXIqOKBsNrcbrcaycTQXG1jqdc6zcyI=";

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

-  buildInputs = [ gtk3 gtk-layer-shell ];
+  buildInputs = [ gtk3 gtk-layer-shell librsvg ];

  preInstall = ''
    mkdir -p $out/share/nwg-bar
@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "safecloset";
-  version = "1.3.0";
+  version = "1.3.1";

  src = fetchFromGitHub {
    owner = "Canop";
    repo = "safecloset";
    rev = "v${version}";
-    hash = "sha256-HY8HaWGsqKUsqNLFpxrGJvAcVD68fqKX2v7xCiEKuDM=";
+    hash = "sha256-ZvJbPbKS7HZ9R4Z9bMrXVjKtIdKE5dkp115dmHv7uJY=";
  };

-  cargoHash = "sha256-geZoqfPgYUd4X903EM7+gq/VPvIClAmlC0nkqWriB0M=";
+  cargoHash = "sha256-vyn/rcptkJLjXg8qjAnzc2bDjz2r0LsGa8toyybgdbM=";

  buildInputs = lib.optionals stdenv.isDarwin [
    darwin.apple_sdk.frameworks.AppKit
@@ -91,11 +91,11 @@ in

 stdenv.mkDerivation rec {
  pname = "brave";
-  version = "1.57.57";
+  version = "1.57.62";

  src = fetchurl {
    url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-    sha256 = "sha256-B1V4BsGWBOhWgW4loY12OLLiwlqkIO3y2P6/h0WF71Y=";
+    sha256 = "sha256-98zhLxlV/pe5fownqQ3k165YfcoLLxz2vBM/4FEq8ug=";
  };

  dontConfigure = true;
@@ -469,7 +469,7 @@ buildStdenv.mkDerivation {
  # icu73 changed how it follows symlinks which breaks in the firefox sandbox
  # https://bugzilla.mozilla.org/show_bug.cgi?id=1839287
  ++ [ (if (lib.versionAtLeast version "115") then icu else icu72) ]
-  ++ [ (if (lib.versionAtLeast version "103") then nss_latest else nss_esr) ]
+  ++ [ (if (lib.versionAtLeast version "116") then nss_latest else nss_esr/*3.90*/) ]
  ++ lib.optional  alsaSupport alsa-lib
  ++ lib.optional  jackSupport libjack2
  ++ lib.optional  pulseaudioSupport libpulseaudio # only headers are needed
@@ -15,13 +15,13 @@ let
 in
 buildGoModule rec {
  pname = "k3d";
-  version = "5.5.2";
+  version = "5.6.0";

  src = fetchFromGitHub {
    owner = "k3d-io";
    repo = "k3d";
    rev = "refs/tags/v${version}";
-    hash = "sha256-Pa2kqeVl+TEsHOpnE7+iG3feYVAuYrDYnWyDpWJay7M=";
+    hash = "sha256-KIYwuDPkxhtQy989XW+DcI5NJPhfLP07mYUFc180Sdw=";
  };

  vendorHash = null;
@@ -53,25 +53,11 @@ rec {

  nomad = nomad_1_5;

-  nomad_1_2 = generic {
-    buildGoModule = buildGo120Module;
-    version = "1.2.16";
-    sha256 = "sha256-fhfUpcG91EgIzJ4mCS7geyIJyTSHS2e8t4yYiI3PqpQ=";
-    vendorSha256 = "sha256-kwCDsGFw+25Mimgt/cTK/Z2H7Qh5n4rjr3kIBvjcPL8=";
-  };
-
-  nomad_1_3 = generic {
-    buildGoModule = buildGo120Module;
-    version = "1.3.9";
-    sha256 = "sha256-xfoIzLDG/OfqAPQqeLvQZ11uESWFNyOyLP6Imi+S96w=";
-    vendorSha256 = "sha256-kW0goicoM1lM1NEHPTfozg2EKR1daf33UxT/mVabyfY=";
-  };
-
  nomad_1_4 = generic {
    buildGoModule = buildGo120Module;
-    version = "1.4.6";
-    sha256 = "sha256-l4GvQIS5JSSgjBjPivAKAb7gKlVLw4WoZpPR8LxnLNc=";
-    vendorSha256 = "sha256-05BhKF6kx0wbu74cidpTFhUN668R/AxV6qWmchCm/WE=";
+    version = "1.4.12";
+    sha256 = "sha256-dO98FOaO5MB5pWzeF705s/aBDTaF0OyWnVxWGB91suI=";
+    vendorSha256 = "sha256-D5TcTZa64Jr47u4mrTXK4lUIC5gfBQNVgL6QKh1CaQM=";
    passthru.tests.nomad = nixosTests.nomad;
  };

@@ -2,13 +2,13 @@

 (if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
  pname = "signalbackup-tools";
-  version = "20230905-3";
+  version = "20230906";

  src = fetchFromGitHub {
    owner = "bepaald";
    repo = pname;
    rev = version;
-    hash = "sha256-xbQcrDtTZh0UeNIRODeA1OBgMdqEso2gAFuSpTSvrXo=";
+    hash = "sha256-e2k5L2UaujXHkQQPMZXxft/UREDPykbW70janduBa2M=";
  };

  postPatch = ''
@@ -28,24 +28,20 @@ mkDerivation rec {
  buildInputs = [ qtmultimedia stdenv.cc.cc ];

  installPhase = ''
-      # directory in /nix/store so readonly
-      cd $appextracted
-
-      binary="$(readlink AppRun)"
+      binary="$(realpath ${appextracted}/AppRun)"
      install -Dm755 $binary -t $out/bin

      # fixup and install desktop file
      desktop-file-install --dir $out/share/applications \
        --set-key Exec --set-value $binary \
        --set-key Comment --set-value "${meta.description}" \
-        --set-key Categories --set-value Network default.desktop
+        --set-key Categories --set-value Network ${appextracted}/default.desktop
      mv $out/share/applications/default.desktop $out/share/applications/SoulseekQt.desktop
-
      #TODO: write generic code to read icon path from $binary.desktop
-      icon="$(readlink .DirIcon)"
+      icon="$(realpath ${appextracted}/.DirIcon)"
      for size in 16 32 48 64 72 96 128 192 256 512 1024; do
        mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
-        convert -resize "$size"x"$size" $icon $out/share/icons/hicolor/"$size"x"$size"/apps/$icon
+        convert -resize "$size"x"$size" $icon $out/share/icons/hicolor/"$size"x"$size"/apps/$(basename $icon)
      done
    '';

@@ -1,11 +1,49 @@
-{ lib, bundlerApp, bundlerUpdateScript }:
+{ stdenv
+, lib
+, pkgs
+, bundlerEnv
+, bundlerApp
+, bundlerUpdateScript
+, installShellFiles
+}:

-bundlerApp {
-  pname = "timetrap";
-  gemdir = ./.;
-  exes = [ "t" "timetrap" ];
+let
+  ttBundlerApp = bundlerApp {
+    pname = "timetrap";
+    gemdir = ./.;
+    exes = [ "t" "timetrap" ];

-  passthru.updateScript = bundlerUpdateScript "timetrap";
+    passthru.updateScript = bundlerUpdateScript "timetrap";
+  };
+
+  ttGem = bundlerEnv {
+    pname = "timetrap";
+    gemdir = ./.;
+  };
+
+in
+
+stdenv.mkDerivation {
+  name = "timetrap";
+
+  dontUnpack = true;
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  installPhase = ''
+    mkdir $out;
+    cd $out;
+
+    mkdir bin; pushd bin;
+    ln -vs ${ttBundlerApp}/bin/t;
+    ln -vs ${ttBundlerApp}/bin/timetrap;
+    popd;
+
+    for c in t timetrap; do
+      installShellCompletion --cmd $c --bash ${ttGem}/lib/ruby/gems/*/gems/timetrap*/completions/bash/*;
+      installShellCompletion --cmd $c --zsh ${ttGem}/lib/ruby/gems/*/gems/timetrap*/completions/zsh/*;
+    done;
+  '';

  meta = with lib; {
    description = "A simple command line time tracker written in ruby";
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "workcraft";
-  version = "3.4.0";
+  version = "3.4.1";

  src = fetchurl {
    url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz";
-    sha256 = "sha256-iqHdyyZX3AcBAjPTpZAiJi0IHhEDWBtKp0e2LAdWGsQ=";
+    sha256 = "sha256-/mh8IN3rGUZIYvyrqnhl0mgnizPZzDduXjQHIDouI38=";
  };

  nativeBuildInputs = [ makeWrapper ];
@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "gql";
-  version = "0.5.0";
+  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "AmrDeveloper";
    repo = "GQL";
    rev = version;
-    hash = "sha256-UTyP9ugUXiPMzkeIvPJUtORvcJ93YOBltglmlcym3sI=";
+    hash = "sha256-eWupAfe2lOcOp8hC4sx8Wl1jaVZT4E99I5V9YsMcDZA=";
  };

-  cargoHash = "sha256-AIt7Ns3vNrHQxJU7cSNr+h3tFGZ9hL1OMBqPHS61YUQ=";
+  cargoHash = "sha256-O6Y+JOMpucrjvYAJZe2D97vODFXVysuiitXzMkfcSpI=";

  nativeBuildInputs = [
    pkg-config
@@ -32,14 +32,14 @@

 let
  # macOS - versions
-  fusionVersion = "13.0.0";
-  fusionBuild = "20802013";
+  fusionVersion = "13.0.2";
+  fusionBuild = "21581413";
  unlockerVersion = "3.0.4";

  # macOS - ISOs
  darwinIsoSrc = fetchurl {
-    url = "https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${fusionVersion}/${fusionBuild}/x86/core/com.vmware.fusion.zip.tar";
-    sha256 = "sha256-cSboek+nhkVj8rjdic6yzWQfjXiiLlch6gBWn73BzRU=";
+    url = "https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${fusionVersion}/${fusionBuild}/universal/core/com.vmware.fusion.zip.tar";
+    sha256 = "sha256-8IaEQn1+e+WtjRX9Aopbi6tVTNt9RVyGrpaARtVH6j0=";
  };

  # macOS - Unlocker
@@ -71,8 +71,8 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "vmware-workstation";
-  version = "17.0.0";
-  build = "20800274";
+  version = "17.0.2";
+  build = "21581411";

  buildInputs = [
    libxslt
@@ -100,8 +100,8 @@ stdenv.mkDerivation rec {
    ++ lib.optionals enableMacOSGuests [ gnutar unzip ];

  src = fetchurl {
-    url = "https://download3.vmware.com/software/WKST-1700-LX/VMware-Workstation-Full-${version}-${build}.x86_64.bundle";
-    sha256 = "sha256-kBTocGb1tg5i+dvWmOaPfPUHxrWcX8/obeKqRGR+mRA=";
+    url = "https://download3.vmware.com/software/WKST-${builtins.replaceStrings ["."] [""] version}-LX/VMware-Workstation-Full-${version}-${build}.x86_64.bundle";
+    sha256 = "sha256-9ONh+uvL4YGNGxbpPX1mWO8P4oKPUpwzTsKKBJNxHMc=";
  };

  unpackPhase = ''
@@ -11,7 +11,7 @@ let
    (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
 in stdenv.mkDerivation rec {
  pname = "${name}-bin";
-  version = "26.2.2";
+  version = "26.3.2";

  src = fetchurl {
    url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
@@ -1,95 +1,95 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  iosevka = "14ba5s1x31cypvqlw7qlqpk1sj70sxdj6fkjwbzjmnl1q7j36sja";
-  iosevka-aile = "11dd3ihij89fdxpqb0ni40gq43nzrilpw7s3nq7f1ml0dh6a0r7m";
-  iosevka-curly = "1ay28cgjhw0fkp76ja5k3mks8cl5wxxzsb505jvjxxn2k48nw1lw";
-  iosevka-curly-slab = "0k47hk9xfamrnfaq03is559nlmzk9cdsplm393ldh921ysx1sr69";
-  iosevka-etoile = "1big9dlwdc90ld9y0sxvhrxnny8lwgihrijwc7m22js2mlvddgi4";
-  iosevka-slab = "00dmnxzwmm30946rlj1gl1zp967srr238kvg1r8krk1xz2a15cqv";
-  iosevka-ss01 = "083dbc3g46ivz6ywxcnyqhfr39j3gb7l74brk9afaz9nb83qlkp3";
-  iosevka-ss02 = "0xcya6428cdky0gygc5i30yl9jkhw9h66ln7vlnf46jw4pkh4dki";
-  iosevka-ss03 = "08fg2wiq1rzn3cz4ihn3i44n3ck5i0azr45bf0gjcisizg1snxma";
-  iosevka-ss04 = "042bldpbdhv0rgzpcmsw1q6wqydb01imfwdrvjg4ylpy1vr4aclh";
-  iosevka-ss05 = "1fq4drdvzq4avwmndky686x6x6vn4clzvp87mcacvfl4c5ambcvv";
-  iosevka-ss06 = "0jpih8gjxhrpr5lhy5q5y51jsmw8n62mmkghaqnn1n4crbsp2adp";
-  iosevka-ss07 = "0qv0qflf90acxdqr1ypfah66jijhhbhjj2nn774rys60nfphc0bv";
-  iosevka-ss08 = "09hinpg6i5ghqjmvfashih14rfnp3z08v4xyan5wrkh6cyf5nnmk";
-  iosevka-ss09 = "0q31af86j6wc9p5dzl76kxwr49xp0pg2a9fk5z6z56yfr8dxrc0c";
-  iosevka-ss10 = "0a6wi64vafs2s5cl9px4dvrqwnjjbmw1s57g8w1jgqi7k64iara1";
-  iosevka-ss11 = "19rmicj0m4i5vjhi8g4w0n2cxmnl6ssyfivgg77w6h1rx7cyfi62";
-  iosevka-ss12 = "1nj3388x6yl15qg8xvzqdcp454j9wwyi3w64yvis7f22bmd288rh";
-  iosevka-ss13 = "0rsf55vhkv3vx64sb9riwq711yygwiism2i956xld44x57a80b9h";
-  iosevka-ss14 = "0685b5n7jl4ijf2a64v6sbxzmkaqd1rl1m6yl8ls9ppxph3pps5z";
-  iosevka-ss15 = "04nbq5hrs6g7br342h4px0g68wrgdi7021znfgbmrj0ic32b3nyn";
-  iosevka-ss16 = "0yp4iqz4zy3z5lwv8dfchf8qiykwa3l83dl5ipq7ci1wg3wpfppf";
-  iosevka-ss17 = "1iiysz3hppfshm2yjzsfvg8gs79jcnf63lirxi8vca5afl72mhfk";
-  iosevka-ss18 = "0c163m25ihan3rv1bvf7js6nhs5v19yrif7rsbjz954izp328j3l";
-  sgr-iosevka = "001nm77n3599xn4ns3kaisyf1a4msmhnfcsh37k6bik621k673jl";
-  sgr-iosevka-aile = "04qfjvhh5rnqbyclrw62naaw98vl1py77wz5nig7gq8yv1zm1m3x";
-  sgr-iosevka-curly = "1gxbckamfyrg5spvj3fd6zrsz12cvfrd9mwr39s4ric23d9qcak5";
-  sgr-iosevka-curly-slab = "0hpxia5x6pmvd6sn7ny1wnj8pq07apvaj1767iqgva6gsblf3ddw";
-  sgr-iosevka-etoile = "0m4j1pjmzb416kvrzvifzv1h0rcq2pzzhyyzbzamcixkwafqgbqg";
-  sgr-iosevka-fixed = "05hpjfb7w5zfdgjrpk243kc8gk7a59smzcrf3lc9sa8j4wf9y4ap";
-  sgr-iosevka-fixed-curly = "1i1ihxqh99akjris5kiwspaqjjxbl3h5p4c4kxrd9j9n984q4i5y";
-  sgr-iosevka-fixed-curly-slab = "0xmq3gxgv5pn8ys155kk3lwz9vcnbbj7mxhz96cgr2gjgby59b5a";
-  sgr-iosevka-fixed-slab = "1pvjvwdapjwrc7vgmvvz0j6cvki1g99qzbw1kgpy9vh6kvl57nm1";
-  sgr-iosevka-fixed-ss01 = "10fsl8w9kbb5vy9yj9qzyr5d6bkw1d0sdkbyvwhlynirc1nqfx8k";
-  sgr-iosevka-fixed-ss02 = "0f235lz8j1s6xp99cikmf52ji9px0vrryld7qs3gasjjnqkrnl1z";
-  sgr-iosevka-fixed-ss03 = "10jmd2xxy6xwkk6ckmn5qa4x0386krvhkpic6yp2bwmh3jrq10qw";
-  sgr-iosevka-fixed-ss04 = "1jb6hhrciaxzwcv8n3zfh9s1ars052ssczg94sxyvaddh09qp5y0";
-  sgr-iosevka-fixed-ss05 = "1jv2q3wqh7v6b53sf4ra40345i6i6yx9b2qj59jazlvlc0nindnw";
-  sgr-iosevka-fixed-ss06 = "1kxnphz60n71l86x200xh6s45xb6fhdawrxvi06r7pnza027ckaj";
-  sgr-iosevka-fixed-ss07 = "0asajsgrq5nj0br4d3f814kfm2lfwip33zl2yssm7z99f1kn7dzq";
-  sgr-iosevka-fixed-ss08 = "0jclw1cqgxhm32zwv7ybbal7bnlpm1k0v15fz42kvf1abbj2k6mv";
-  sgr-iosevka-fixed-ss09 = "0a7nazrysbvf1jyqdlk25wswhzvv8mcakjdgckjlpv65hq1fqdzw";
-  sgr-iosevka-fixed-ss10 = "01l07jxhksqyb2wnljnpwpcqxaizcdbzaycq31mkv63aqmcz91vm";
-  sgr-iosevka-fixed-ss11 = "1r67pfmirm43mzz9k7asaif15x43iny5qbds0wjx2z12lscpnj16";
-  sgr-iosevka-fixed-ss12 = "1g4fk496npcix5q4alw1qcqd0w5iyamlg6vv82nk20axrb05gisv";
-  sgr-iosevka-fixed-ss13 = "060pmmzwcfkv517r6jwz5kq0d4b3ha5bzlf4agg8b5d5003didwg";
-  sgr-iosevka-fixed-ss14 = "0f1w5hcaw933jb6v4zmgvgan4k02mfhwzvyrgxyaq60f0gl8456d";
-  sgr-iosevka-fixed-ss15 = "0isw2xpv8zfp145zlnf2gxbdnc54zyn0s7nvsck2qwh6ah1mqiwy";
-  sgr-iosevka-fixed-ss16 = "18cwq0zrq5ih0ijb7bp8f7zvdzg5ni3pmiw18g9p2zkrswyahgnc";
-  sgr-iosevka-fixed-ss17 = "0d1jbj65n4wj0d549sramf6d3jgx2hrfac7m00m5rsfrlg3l9xg3";
-  sgr-iosevka-fixed-ss18 = "0iv1wwa1333v3prc3ykms6z454ypmasi8n419xl6c71n4f3haf1s";
-  sgr-iosevka-slab = "0zfxx0wp00l80skiimlikibsw9iy9lq86s5jhz1dc59g2bldvqdx";
-  sgr-iosevka-ss01 = "0k17663haxcnidmi5hkk9w2hmhxjxj89h4cwby1wrc52zlj491cb";
-  sgr-iosevka-ss02 = "1aqsi8xa0napzsdvmy39msy8fj4nf5an7bsxwj7dgpm9p0irdncq";
-  sgr-iosevka-ss03 = "0zhx2r3f55628brvz973nsikafx23m4mjw5lyzlqgig1d1d2jd58";
-  sgr-iosevka-ss04 = "0ls91yih8plwgi9a00iwrxk21y8psjv7bjlzncw5fwhcyp6l8xjh";
-  sgr-iosevka-ss05 = "15qabrrd2ldrkksbgifdx19zcq4hcvwvwnj7k3bga4p56ymh3jrq";
-  sgr-iosevka-ss06 = "03zh49jnsiqpxi3j4f82as6c0wm14c9lnvvjq7x4q9xn6hgv87w1";
-  sgr-iosevka-ss07 = "0y4m22rrqw3sq62yhrraajcqdrwpw6g3wrzcn24d66z2s0zlsk5i";
-  sgr-iosevka-ss08 = "1nsx2f1572i5zj78v60mryiwiaxaj1rqmgwp8bpn95j6v45q3jbq";
-  sgr-iosevka-ss09 = "04p0vbl0aa7q761a0mrkgfhv1iy3ppj5hlmr91ppc8ygc3qyy7lx";
-  sgr-iosevka-ss10 = "0la09xfllcxdvhbl2r912af900w86lsxw1wz4nfaf6sx0cmq0qly";
-  sgr-iosevka-ss11 = "1ivg46g0mhb27mky6ivdijq3nnx5ix2w25nnbhfl7bw4fa0yvqzr";
-  sgr-iosevka-ss12 = "1v7kf3d2g52qp4jlhc6b0iqd4jcbx8fj7cxgj86nj50q7g2i2kan";
-  sgr-iosevka-ss13 = "050myw7bqi8fjbc3w5wd2449gw7jbciqc0lziyc1z9rds6yihm7x";
-  sgr-iosevka-ss14 = "05ligav2dp5hqk8lri8bqpklrj6s8mah5ivmclwcyd2dqpj1m2c6";
-  sgr-iosevka-ss15 = "14acj64zw46fbq4d8hqx7vvd6anizg90slszrw0zpqlcp7nc96ks";
-  sgr-iosevka-ss16 = "12ykdlsmax302mxrdfaas1xzrn5532dswpc2444gwfp3hzawc1df";
-  sgr-iosevka-ss17 = "123xakjnvb9k0wlxgya6d7a79kyaxcdx8hdwkypv7v5b162xbnvp";
-  sgr-iosevka-ss18 = "0chbcs283j4clxvx6x72ckkfp2jqklcvswn7kwm4y7yjc0fc1xqc";
-  sgr-iosevka-term = "0y5kwfxn4gxqwbav58l43pcd6qspc2pakjqyhhm3202i6j1hw46w";
-  sgr-iosevka-term-curly = "1ixspd969sk4af9qvmws17zmlxp1jgizbaw3549pjwwwagk4jx6p";
-  sgr-iosevka-term-curly-slab = "0j326l33m4bdkwcjwiidn6liqdihm1d1kb6ccdnkmqw18qfj8hw0";
-  sgr-iosevka-term-slab = "0l01nzfz1l379w73vxyjyamjqyrqp9xznkd3gy6zljzky8n1759x";
-  sgr-iosevka-term-ss01 = "1fyrzd9q349q2hd4y2xchsvw2h87j3szyqyga88dasskx30z7v3q";
-  sgr-iosevka-term-ss02 = "0d3wbc027p0jzajrs1vkn98f0ivl0w0p4wvkdvq2f042z4jagmm7";
-  sgr-iosevka-term-ss03 = "0n3034kvwbc55gawm358g5aacpnp81krkm1d5ypacb508pjgjdyk";
-  sgr-iosevka-term-ss04 = "1jdsan75k60n3w3mrgs9ciqr597jv9dgs2y99hkpdirqxfixyhga";
-  sgr-iosevka-term-ss05 = "0p57qlkzh6y10klhrxfa9x1iccjn6jfq3974irhki0r6b0y0bsj1";
-  sgr-iosevka-term-ss06 = "05mq1r01dnkh40jjrgj0lskqsqfcnqqzz9ssqbcbf3cihfrwfc28";
-  sgr-iosevka-term-ss07 = "0gkwx1yw2ajcgnj8iifhzxcwpf8f9afs1wl240kfzwsnlr4gzr80";
-  sgr-iosevka-term-ss08 = "1173gg7pfpwq2f8rq664l5l3491sj2q3i33gyr1cqpmcsfncnv1i";
-  sgr-iosevka-term-ss09 = "12p3a68rd5a3s0z2vf6gbrm2jm2q4drlwb7v7jkrxyi7idhw26fi";
-  sgr-iosevka-term-ss10 = "10mwk14v9d8cd162pm237hs5kkyi7vlg9dwj63i6q2a6xjlqmcdp";
-  sgr-iosevka-term-ss11 = "0s055c7hmjva7sb4rm1fiwbbkwcrxh4qlzjxhqla8n2cwdyd1r08";
-  sgr-iosevka-term-ss12 = "00g7038p7d187zz3sf87px6qzg4dsrcyfzag8a7r3wj84v1msx5n";
-  sgr-iosevka-term-ss13 = "0v38d2jhvbd63f47krvg840v5f8cddq0imy62bfaknvp8lmdl1rl";
-  sgr-iosevka-term-ss14 = "022y7rz00vjk5xhqi6rmp5mpj2gzayi9qam93ymrhk2nnm26fpr1";
-  sgr-iosevka-term-ss15 = "1sr7qlr0jd5fi2avkag2ls78n37ddmfqa00jb38bpas4rcm2c1wb";
-  sgr-iosevka-term-ss16 = "0wj51pvx4ijm27afh85bhw3cdhczrxhkzdnhbl18rjccvxyy121q";
-  sgr-iosevka-term-ss17 = "1dcby5m73a679vl8q5ipxbqby9ivknybyjx3z24z53w5h2ad4s5p";
-  sgr-iosevka-term-ss18 = "114fpyh2slwv900h7zwm07rzcx97k2153fxvnbbnyjgjhlpdkbjv";
+  iosevka = "1x0jvkr00k7g1cyvdr2c6bq93zzs9jkjfp553sq729gswvf40kzr";
+  iosevka-aile = "033zsjqkzp1sdvl5acx2blypzfnmf4j2nhk6h05hr4w0xwia9srv";
+  iosevka-curly = "15yyagvl6pxqvizjazn9j0m7s7nv4wyid0wqs91wg7w9nakrhnfs";
+  iosevka-curly-slab = "05m1mjd1kgfpmx7yfkiccd5r765w9xc50sqvxrr599mycd8ddh56";
+  iosevka-etoile = "0z2j66fzvxngqjywmvcgz307c77clz8pasm8dclcwl942l87i395";
+  iosevka-slab = "1s7i4x6v1nf8jx4p7s3mpldjrbkzciak8znnpyzhwkq6ncqvdv6y";
+  iosevka-ss01 = "0liwcnjv64p6c20y0lpppsdnpgfrkdrk0njmcvyd6sqil8lxy2rz";
+  iosevka-ss02 = "0n6w0l6b2wqjqpxl7jcnk40fmjwf06zr6ca6cnhvzaklribs1ika";
+  iosevka-ss03 = "04sv1wljvh0prmdm3svldlyqkvd90zwfy1qbw4518119lvg9h86p";
+  iosevka-ss04 = "1ahqhy14igk48q5abslbb1f5g3py69sb6fdzs1gphh0k8vzbawi6";
+  iosevka-ss05 = "0gx907wziwm6h4vkc2f2d3ja9657i4vfpsia3dhl0amvc5pmvpsc";
+  iosevka-ss06 = "0ybl1lgva3warfxqccip9ygfvwa9pw904qvsa4ar160lc767fc19";
+  iosevka-ss07 = "0ldmdshb9d60db52zrknpm0lxmvvik8rxvy9zy2n2lpv7d9dnfgf";
+  iosevka-ss08 = "0kp0zqbjkj9szxn5l7688pnnbwwvjfxy55spwp4ba3rfcsl6mp5y";
+  iosevka-ss09 = "00k73f7xrfhv6mif70dykv12krg1bnnj4brx8bnd4lcxmg6b34ks";
+  iosevka-ss10 = "0r3h2hpkgh3fncrhlm1g23qkbrpqgjxb7sdmi78wznxn4g9hviwv";
+  iosevka-ss11 = "03q7ny5hk6llid2278k139dwaq1afg0r0fa9gjwhdb960r2rya24";
+  iosevka-ss12 = "0jp5jszwhd4idxqw97n7za88bm7ch9nfxvxk7s9kx4mxznj2bacz";
+  iosevka-ss13 = "1rg7kpqcvf22scdmlbi61h0zw58c46m00ihf2rzvzjfllfzmcqhh";
+  iosevka-ss14 = "09zqsycwjz3g0vj9rqripc9kii67zdj7bkb9j0i5zkbqi2xgab0k";
+  iosevka-ss15 = "0rfhvrxyc24skizhy5fplfvgimvjdd95h1bjjbgrz8sqqld92qal";
+  iosevka-ss16 = "091jnvc9jdzf2hnv1ciczmhrngrlhj3gfsjl7ahbimxagxzf31a5";
+  iosevka-ss17 = "0brcyhg806vs38d8vanq19fffk05lcksairykiapkxhblwv0sy67";
+  iosevka-ss18 = "03h37wi1y85jxjjkk3gjlsphyd2wwsba0lwawi4k8hr0d1l9kglx";
+  sgr-iosevka = "0db82n6w5x0ajs9pr4glpd9b8han32addkfbbb84b3nxx6snn1bc";
+  sgr-iosevka-aile = "097gv8i3dpl41wz4ahd4wz5jfiycm44gpxfnicn5d2zw0p84cjzv";
+  sgr-iosevka-curly = "0lly5hs0jpin33i2h796cr37mdhn3v1x9j5dbcrsdi6wm4ql9kk9";
+  sgr-iosevka-curly-slab = "088jxb727gaf6k4b3cvj9sjhnv4d3yhg96l8iibf930q5c0nflm8";
+  sgr-iosevka-etoile = "11vhpd8j351sgpbg0gxjbgl3ycd1x4xvvv3x9zflxb80l6ch7dym";
+  sgr-iosevka-fixed = "1z0gwcdd1i40swmjxlpf1q4y0123layr3b2yz8pbm8bcpwdyds62";
+  sgr-iosevka-fixed-curly = "194r71zczwf4xjy9x6rjarm2vwaxazirvv04yvi08wcny17ln1d5";
+  sgr-iosevka-fixed-curly-slab = "0j0yqr2icbxdgpwpdbsg6rpi54w3vjxz8xi2cgc8warsydp9p167";
+  sgr-iosevka-fixed-slab = "11s9s1bb982p1p7g5hv2gm8rvhnfls49hrz78gx07nm7ybz4g4i9";
+  sgr-iosevka-fixed-ss01 = "0isa4q30nacz5avw9cr67v8h3p3w0nn9nwlfk1pb35lsm2sxjgqr";
+  sgr-iosevka-fixed-ss02 = "104lqk88w3lv1rchgzh1d9pg2hcgfnwiyvn0p5jii1q7c96dl9xw";
+  sgr-iosevka-fixed-ss03 = "07mkd430yhnnmk3kpmrlagz8kfl0wr44y6bg6w07b1cb5x7bs53q";
+  sgr-iosevka-fixed-ss04 = "1g812caqnzs78cmn1f2297bnnsdyhvswmv3bx9kqg2sx76kkrdym";
+  sgr-iosevka-fixed-ss05 = "0yhmg63vck9108ncg2dnm9vbf6zj5vsjjp0gna1mqn0cn2wvah9i";
+  sgr-iosevka-fixed-ss06 = "0pd73ra3dyc3qawkg7w4w602nqckrbx4sjvbirlmf55krqhkaqgr";
+  sgr-iosevka-fixed-ss07 = "12rxwqks5ka7h0sxsbdmncfx5ln11isa5df7i3cnwxvqdxh2smyf";
+  sgr-iosevka-fixed-ss08 = "1v3h11x5bal8m7glfqqzgv3cx2frgsz7gz2lsnqwsbkn5x9cd66f";
+  sgr-iosevka-fixed-ss09 = "0l03bk1h495r4k275is4i98f4rdhicn6ff14prarl3n68fb68gx0";
+  sgr-iosevka-fixed-ss10 = "0r5bixx333fbv1gddm8hzflki80zwk54lv373x0aw6iji33ybb97";
+  sgr-iosevka-fixed-ss11 = "1v01q658fa4dqxh7wrl8s950cmcqprdnghhrqyas17wrpy3b7jin";
+  sgr-iosevka-fixed-ss12 = "11yhc63rn08znfram3ycz5qfwgh4jjpwn0hagjz78d6i6sandzf1";
+  sgr-iosevka-fixed-ss13 = "1hgli7vkkwxgp03c48y76ldajdiaayd0blgdm49gjd2jhl0hkkbz";
+  sgr-iosevka-fixed-ss14 = "1qgv0zd6kxvbdjznmzzs3vgyk1fgg58pvfd04h9zr22n4h08a7lw";
+  sgr-iosevka-fixed-ss15 = "1a4wcwgh8mnrd0p10ybw5g1v0dyc6pi8vlf561miv7xxxhwsnxn6";
+  sgr-iosevka-fixed-ss16 = "112p61cqiwzfilddwqq0i9b896vb25mbkkl51ac9xabp28izl0m3";
+  sgr-iosevka-fixed-ss17 = "16k69hv04mcnsyb6cnrbd9cgfv8ifkazwnfs5scfijcz9rbs4zm6";
+  sgr-iosevka-fixed-ss18 = "1gm3azw6hsz42fmiiangg8rba4dh6r6a3mqh9nphkd6x0ipmvmkn";
+  sgr-iosevka-slab = "0vn49nms0n3vm76g0lblfhnxkhjkx2kf3xwjqds34c24gzbyhhiz";
+  sgr-iosevka-ss01 = "07nki2ip4kjnli32gw47pdznvyj50a4k72b53x3nxgb1ag3z9gmw";
+  sgr-iosevka-ss02 = "0pq0g8xq9yrrwihq07bylrwj0cvj06xwiqi6njc08lci31xnf5gm";
+  sgr-iosevka-ss03 = "1lbapf246fmdlck4fddy53758nci8g3ph7mhrc3hr1ndx99whrnb";
+  sgr-iosevka-ss04 = "1g32mj1k1al50zcxnbfarb6qvvr5rfq9bmzkq9j2nfr4qjcgwr63";
+  sgr-iosevka-ss05 = "0pynimqhc2bz1sd249cjlpbndy0wp17w59r1s87lhdikqqymb2ck";
+  sgr-iosevka-ss06 = "1nsiwjw2f1w2n5n5iqgscgg25zk821b2ps3mb6h6knnsdgw9snpq";
+  sgr-iosevka-ss07 = "1vm5jmiw6x1b8zlv5ipjqzwx9bwaj9mlcpj9xnayafdx5giwsm81";
+  sgr-iosevka-ss08 = "1fhcn9qn6fq1q6f2xnszy5yzpn88rh1hbax8pb1cdrg304ksjqsx";
+  sgr-iosevka-ss09 = "1837k4r634pr3dkz5mk9sbmpafgnpw0dgj9n4k19396n47llbzc1";
+  sgr-iosevka-ss10 = "0agdxcgysrapg038grv3i753k4l1dqqs56g45aj6b0sp3ygjpkpa";
+  sgr-iosevka-ss11 = "00367dmgva7mhwnnxrjmcag39k0sizr443sv06pscglmgrl7f2y6";
+  sgr-iosevka-ss12 = "0h9m42a6jybwjlv2pq1agdprppcvsgyvyif0l8yv9kji2i2gj2ln";
+  sgr-iosevka-ss13 = "1m2xmmfq7qrff3av6wnw1zs2zh6hsic0in8rx2m01q71j8k7galk";
+  sgr-iosevka-ss14 = "19zk3kqm1870hri7q2cpryy274klk8ddf2vrlqipndxai26k6pxh";
+  sgr-iosevka-ss15 = "0ssbdq3cgidyw5dhgdnfh5vz648d10z6fsp46kkir4xir3j5xj3k";
+  sgr-iosevka-ss16 = "1kr7c4aw9nslizfv9nsxd9rj1kqd0klw375n4vy3r434rdrhgdhp";
+  sgr-iosevka-ss17 = "1k5vzkf5nhfspq22cmm4l1547wpkc521p1lsz1xz1pwgxgxfqgb6";
+  sgr-iosevka-ss18 = "1niykrhiwnzzk6sm95fjrh6dlpzswbqvpcgx4accq4zxlm8llpgf";
+  sgr-iosevka-term = "0sfxz35zcn7xnak57l6nmsicl13y9wh20pqh2cq7gv820vqfhsyj";
+  sgr-iosevka-term-curly = "0p42d65yk8ywfsjkw8vd6jy11qpwf9yczvs23265wlql7xdi5vgj";
+  sgr-iosevka-term-curly-slab = "0blh2r7166bbm981g1vhg4ri2injawb3kzf4d2y8jlnhlvi7hvjp";
+  sgr-iosevka-term-slab = "13b470id7xksp60k6agf9vg64shd0p5079059nvd6h87lr7wya80";
+  sgr-iosevka-term-ss01 = "195f5yrfvwvhb1blk2lrkzwc2vpbbg8y4l0hrmackmxy0ana4kfb";
+  sgr-iosevka-term-ss02 = "1r5qxk98x2zb50rggk216ghbwncdqhjax54r0157d68g8xknrrqd";
+  sgr-iosevka-term-ss03 = "01j6dnn995x4knvvifywb9cmqixrn2c9y9lvq31pdv5v241i9w28";
+  sgr-iosevka-term-ss04 = "01y0hacz8n4wfwqhsiswzy1czy3z1ndb881cvry19d2cg7ch328q";
+  sgr-iosevka-term-ss05 = "1hy8caysjd08aqkgjabs6jdp57fcg835brplfbcjqqfr22k5d5z8";
+  sgr-iosevka-term-ss06 = "12qqr9wk7qxpyxz8cj6zplx54g63gdy9jbsiaj29cagnkjwl1rjj";
+  sgr-iosevka-term-ss07 = "06wg3zyddcpac0gw8r37gdij3ls220f9issxn1mrrczl5wdhv8k0";
+  sgr-iosevka-term-ss08 = "0q5sxz53hqv9d8g6qv7sgcz13cxg76pwln3y72frrw1jjwvfgvdk";
+  sgr-iosevka-term-ss09 = "187mip309cfdwpw5gzjb9jwygvnfhc2bvzi0vybhhz5a70hfdbfv";
+  sgr-iosevka-term-ss10 = "1c258790xqp2bkva7md5cpi9wc6581r5j21n17srhk3dgav77q91";
+  sgr-iosevka-term-ss11 = "0qxbhg1acr6wd8ys0a5ga1pcpfqz3wwvpah9qym7pxdgmqbjq8p8";
+  sgr-iosevka-term-ss12 = "01bayvin0z6nbak2i23539aciw3g1rgqr2av38n1l0l8dpibrwbb";
+  sgr-iosevka-term-ss13 = "1qfw019paggnn6iq72zlpn132xg821awrhbyigkywj169v0nappf";
+  sgr-iosevka-term-ss14 = "0xkwj83lb6hyvz95g0rqcb7apg9njxal9sn5cgkc4abgvnvh3id9";
+  sgr-iosevka-term-ss15 = "0wnqf1bhz4jrm2g7gb3av63d3wnnb9341nlvjgb9yis03akawch3";
+  sgr-iosevka-term-ss16 = "17jwakhnl1sp6v6f8d4p47m1xpklv3r5kyvv97zyw4v7calrkabq";
+  sgr-iosevka-term-ss17 = "15kk0zl9ypz2wyyc80qla51m6bcganrima28w2rcgr1h2amwcdhm";
+  sgr-iosevka-term-ss18 = "1dkfxanxmix3afbqrdbagkpwy9ql37s4iami63l5axcq51g3fzkv";
 }
@@ -279,5 +279,6 @@ let
      inherit llvm_meta targetLlvm;
    };
  });
+  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];

-in { inherit tools libraries release_version; } // libraries // tools
+in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools)
@@ -294,5 +294,6 @@ let
      inherit llvm_meta targetLlvm;
    };
  });
+  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];

-in { inherit tools libraries release_version; } // libraries // tools
+in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools)
@@ -295,5 +295,6 @@ let
      inherit llvm_meta targetLlvm;
    };
  });
+  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];

-in { inherit tools libraries release_version; } // libraries // tools
+in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools)
@@ -317,5 +317,6 @@ let
      inherit llvm_meta targetLlvm;
    };
  });
+  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];

-in { inherit tools libraries release_version; } // libraries // tools
+in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools)
@@ -315,5 +315,6 @@ let
      inherit llvm_meta targetLlvm;
    };
  });
+  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];

-in { inherit tools libraries release_version; } // libraries // tools
+in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools)
@@ -388,5 +388,6 @@ in let
      inherit llvm_meta targetLlvm;
    };
  });
+  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];

-in { inherit tools libraries release_version; } // libraries // tools
+in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools)
@@ -401,5 +401,6 @@ in let
      inherit llvm_meta targetLlvm;
    };
  });
+  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];

-in { inherit tools libraries release_version; } // libraries // tools
+in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools)
@@ -135,5 +135,6 @@ let
      inherit llvm_meta targetLlvm;
    };
  });
+  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];

-in { inherit tools libraries release_version; } // libraries // tools
+in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools)
@@ -136,5 +136,6 @@ let
      inherit llvm_meta targetLlvm;
    };
  });
+  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];

-in { inherit tools libraries release_version; } // libraries // tools
+in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools)
@@ -283,5 +283,6 @@ let
      inherit llvm_meta targetLlvm;
    };
  });
+  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];

-in { inherit tools libraries release_version; } // libraries // tools
+in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools)
@@ -282,5 +282,6 @@ let
      inherit llvm_meta targetLlvm;
    };
  });
+  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];

-in { inherit tools libraries release_version; } // libraries // tools
+in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools)
@@ -282,5 +282,6 @@ let
      inherit llvm_meta targetLlvm;
    };
  });
+  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];

-in { inherit tools libraries release_version; } // libraries // tools
+in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools)
@@ -379,5 +379,6 @@ in let
      inherit llvm_meta targetLlvm;
    };
  });
+  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];

-in { inherit tools libraries release_version; } // libraries // tools
+in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools)
@@ -1,7 +1,7 @@
 { mkDerivation }:
 mkDerivation {
-  version = "1.15.4";
-  sha256 = "sha256-0DrfKQPyFX+zurCIZ6RVj9vm1lHSkJSfhiUaRpa3FFo=";
+  version = "1.15.5";
+  sha256 = "sha256-2M1xen5gwmtOu4ug0XkxYke6h+Bw89JkpQGMDhbtNa0=";
  # https://hexdocs.pm/elixir/1.15.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
  minimumOTPVersion = "24";
  escriptPath = "lib/elixir/scripts/generate_app.escript";
@@ -5,18 +5,18 @@

 buildGoModule rec {
  pname = "expr";
-  version = "1.15.0";
+  version = "1.15.1";

  src = fetchFromGitHub {
    owner = "antonmedv";
    repo = "expr";
    rev = "v${version}";
-    hash = "sha256-UZUy2qZQh5vGWVw08ZSJTTy6Obh2dIHkk7p1G+B0du0=";
+    hash = "sha256-ILa+PG2UU/qgLvcsEoC0rHIeQvKRMUfW60AT6wjApZg=";
  };

  sourceRoot = "${src.name}/repl";

-  vendorHash = "sha256-RnrM7L1QppUPBi3sJ4xM/UChFHADEpAA36JaURP7Vo4=";
+  vendorHash = "sha256-jdf3MPix+nDr2X6se4I8SNMUCd/Ndr9PvJZgJEk+cL4=";

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

@@ -1,4 +1,5 @@
 { fetchurl
+, fetchpatch
 , lzwolf
 , SDL2_mixer
 , timidity
@@ -12,6 +13,17 @@ SDL2_mixer.overrideAttrs(oa: rec {
    sha256 = "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl";
  };

+  patches = [
+    # These patches fix incompatible function pointer conversion errors with clang 16.
+    (fetchpatch {
+      url = "https://github.com/libsdl-org/SDL_mixer/commit/4119ec3fe838d38d2433f4432cd18926bda5d093.patch";
+      stripLen = 2;
+      hash = "sha256-Ug1EEZIRcV8+e1MeMsGHuTW7Zn6j4szqujP8IkIq2VM=";
+    })
+    # Based on https://github.com/libsdl-org/SDL_mixer/commit/64ab759111ddb1b033bcce64e1a04e0cba6e498f
+    ./SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch
+  ];
+
  # fix default path to timidity.cfg so MIDI files could be played
  postPatch = ''
    substituteInPlace timidity/options.h \
@@ -0,0 +1,26 @@
+--- a/music_mpg123.c	2018-10-31 10:59:00.000000000 -0400
+++ b/music_mpg123.c	2023-09-05 21:31:51.529191521 -0400
+@@ -48,7 +48,11 @@
+     int (*mpg123_open_handle)(mpg123_handle *mh, void *iohandle);
+     const char* (*mpg123_plain_strerror)(int errcode);
+     void (*mpg123_rates)(const long **list, size_t *number);
+#if (MPG123_API_VERSION >= 45) /* api (but not abi) change as of mpg123-1.26.0 */
+    int (*mpg123_read)(mpg123_handle *mh, void *outmemory, size_t outmemsize, size_t *done );
+#else
+     int (*mpg123_read)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done );
+#endif
+     int (*mpg123_replace_reader_handle)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) );
+     off_t (*mpg123_seek)( mpg123_handle *mh, off_t sampleoff, int whence );
+     const char* (*mpg123_strerror)(mpg123_handle *mh);
+@@ -95,7 +99,11 @@
+         FUNCTION_LOADER(mpg123_open_handle, int (*)(mpg123_handle *mh, void *iohandle))
+         FUNCTION_LOADER(mpg123_plain_strerror, const char* (*)(int errcode))
+         FUNCTION_LOADER(mpg123_rates, void (*)(const long **list, size_t *number));
+#if (MPG123_API_VERSION >= 45) /* api (but not abi) change as of mpg123-1.26.0 */
+        FUNCTION_LOADER(mpg123_read, int (*)(mpg123_handle *mh, void *outmemory, size_t outmemsize, size_t *done ))
+#else
+         FUNCTION_LOADER(mpg123_read, int (*)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done ))
+#endif
+         FUNCTION_LOADER(mpg123_replace_reader_handle, int (*)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) ))
+         FUNCTION_LOADER(mpg123_seek, off_t (*)( mpg123_handle *mh, off_t sampleoff, int whence ))
+         FUNCTION_LOADER(mpg123_strerror, const char* (*)(mpg123_handle *mh))
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
    license = licenses.isc;
    platforms = platforms.unix;
    maintainers = with maintainers; [
+      fogti
      yuu
-      zseri
    ];
  };
 }
@@ -14,9 +14,11 @@ stdenv.mkDerivation rec {
    stripRoot = false;
  };

-  nativeBuildInputs = [
-    autoPatchelfHook
-  ];
+  outputs = [ "out" "dev" ];
+
+  buildInputs = [ (stdenv.cc.cc.libgcc or null) ];
+
+  nativeBuildInputs = [ autoPatchelfHook ];

  installPhase =
    let
@@ -28,6 +30,8 @@ stdenv.mkDerivation rec {

      install -Dm555 lib/${processor}/discord_game_sdk${sharedLibrary} $out/lib/discord_game_sdk${sharedLibrary}

+      install -Dm444 c/discord_game_sdk.h $dev/lib/include/discord_game_sdk.h
+
      runHook postInstall
    '';

@@ -36,6 +40,7 @@ stdenv.mkDerivation rec {
    description = "Library to allow other programs to interact with the Discord desktop application";
    license = licenses.unfree;
    maintainers = with maintainers; [ tomodachi94 ];
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "x86_64-windows" ];
  };
 }
@@ -7,22 +7,22 @@
 , redisSupport ? false, hiredis
 , mysqlSupport ? false, libmysqlclient, mariadb }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "drogon";
-  version = "1.8.3";
+  version = "1.8.6";

  src = fetchFromGitHub {
    owner = "drogonframework";
    repo = "drogon";
-    rev = "v${version}";
-    sha256 = "sha256-I3f/8TMGm1G4CFMJJLyiVYso9yTHjeLefS5eaGySvC4=";
+    rev = "v${finalAttrs.version}";
+    sha256 = "sha256-BYZoMesDquXaphZvnf2Vd/RuOC9jsOjZsGNbDmQ3u+c=";
    fetchSubmodules = true;
  };

  nativeBuildInputs = [ cmake ];

  cmakeFlags = [
-    "-DBUILD_TESTING=${if doInstallCheck then "ON" else "OFF"}"
+    "-DBUILD_TESTING=${if finalAttrs.finalPackage.doInstallCheck then "ON" else "OFF"}"
    "-DBUILD_EXAMPLES=OFF"
  ];

@@ -43,21 +43,19 @@ stdenv.mkDerivation rec {
    # this part of the test would normally fail because it attempts to configure a CMake project that uses find_package on itself
    # this patch makes drogon and trantor visible to the test
    ./fix_find_package.patch
-
-    # see https://github.com/drogonframework/drogon/issues/1491
-    (fetchpatch {
-      url = "https://github.com/drogonframework/drogon/commit/7d87d7e0b264ce53aa5ee006fb022d3516c9d666.patch";
-      sha256 = "sha256-C4zH9oNMfhkaeVNvZuBuzu1v2vNgg/t+YPitbrmHg+Y=";
-    })
  ];

  # modifying PATH here makes drogon_ctl visible to the test
  installCheckPhase = ''
-    cd ..
-    PATH=$PATH:$out/bin bash test.sh
+    (
+      cd ..
+      PATH=$PATH:$out/bin $SHELL test.sh
+    )
  '';

-  doInstallCheck = true;
+  # this excludes you, pkgsStatic (cmake wants to run built binaries
+  # in the buildPhase)
+  doInstallCheck = stdenv.buildPlatform == stdenv.hostPlatform;

  meta = with lib; {
    homepage = "https://github.com/drogonframework/drogon";
@@ -66,4 +64,4 @@ stdenv.mkDerivation rec {
    maintainers = with maintainers; [ urlordjames ];
    platforms = platforms.all;
  };
-}
+})
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  version = "0.1.1";

  src = fetchFromGitHub {
-    owner = "zseri";
+    owner = "fogti";
    repo = "libowlevelzs";
    rev = "v${version}";
    sha256 = "y/EaMMsmJEmnptfjwiat4FC2+iIKlndC2Wdpop3t7vY=";
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {

  meta = with lib; {
    description = "Zscheile Lowlevel (utility) library";
-    homepage = "https://github.com/zseri/libowlevelzs";
+    homepage = "https://github.com/fogti/libowlevelzs";
    license = licenses.mit;
-    maintainers = with maintainers; [ zseri ];
+    maintainers = [ maintainers.fogti ];
    platforms = platforms.all;
  };
 }
@@ -5,6 +5,6 @@
 #       Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert

 import ./generic.nix {
-  version = "3.92";
-  hash = "sha256-PbGS1uiCA5rwKufq8yF+0RS7etg0FMZGdyq4Ah4kolQ=";
+  version = "3.93";
+  hash = "sha256-FfVLtyBI6xBfjA6TagS4medMPbmhm7weAKzuKvlHaoo=";
 }
@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchurl
+, fetchpatch
 , asciidoc
 , docbook-xsl-nons
 , docbook_xml_dtd_45
@@ -46,13 +47,22 @@

 stdenv.mkDerivation rec {
  pname = "tracker-miners";
-  version = "3.5.0";
+  version = "3.5.2";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "F5ZmA9xDKphSa0kFhqSKzX+fWZNfeJXfxRcppGppAaM=";
+    sha256 = "QPuR+svZRo4m6+zHEdg2Mc2K6TkcYV1o27A8vKsbbGk=";
  };

+  patches = [
+    # Use cc.has_header_symbol to check for BTRFS_IOC_INO_LOOKUP
+    # https://github.com/NixOS/nixpkgs/issues/228639
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/tracker-miners/-/commit/c08fbe0650d4a2ae915a21764f54c02eda9406d5.patch";
+      sha256 = "U81+yfg2sUkKl4tKMeB7pXJRNSeIE+2loT3/bvnhoKM=";
+    })
+  ];
+
  nativeBuildInputs = [
    asciidoc
    docbook-xsl-nons
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "maestro";
-  version = "1.31.0";
+  version = "1.32.0";

  src = fetchurl {
    url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip";
-    sha256 = "0rgkviyxr0hwm0xhv8mfhdxk3wzhgqhbjpk8wv6c2b68xnwxwxha";
+    sha256 = "1bhyg0w6dwgba0ykk898dxs661imcx2s6si3ldwgg01pmxpcsm30";
  };

  dontUnpack = true;
@@ -9,17 +9,17 @@

 buildPythonPackage rec {
  pname = "django-jinja";
-  version = "2.10.2";
+  version = "2.11.0";

-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8";

  format = "setuptools";

  src = fetchFromGitHub {
    owner = "niwinz";
    repo = "django-jinja";
-    rev = version;
-    hash = "sha256-IZ4HjBQt6K8xbaYfO5DVlGKUVCQ3UciAUpfnqCjzyCE=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-0gkv9xinHux8TRiNBLl/JgcimXU3CzysxzGR2jn7OZ4=";
  };

  propagatedBuildInputs = [
@@ -16,7 +16,7 @@

 buildPythonPackage rec {
  pname = "glyphslib";
-  version = "6.3.0";
+  version = "6.4.0";

  format = "pyproject";

@@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "googlefonts";
    repo = "glyphsLib";
    rev = "refs/tags/v${version}";
-    hash = "sha256-wBtotr7nH7KL5ISaJFs4i8CCv4OCZnVOREUon8jhQdY=";
+    hash = "sha256-vbyI5pSoQWFHG8aqZC4FExKzzIo6yxwl9DgGSgDz8xU=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -20,13 +20,13 @@

 buildPythonPackage rec {
  pname = "localstack";
-  version = "1.4.0";
+  version = "2.2.0";

  src = fetchFromGitHub {
    owner = "localstack";
    repo = "localstack";
    rev = "refs/tags/v${version}";
-    hash = "sha256-mfPlpB1CvYuhnfucDfJjZtNS+1Kz0/l3+3uUXxxGiF4=";
+    hash = "sha256-hlK3pltajFRAtiwLOJQNmxRfoRAX5Jccygglbhb45O8=";
  };

  postPatch = ''
@@ -1,36 +1,22 @@
-From c5d32ef5d656b0aa4b2c1fc61c901d40bf2fb96a Mon Sep 17 00:00:00 2001
-From: Alexander Ben Nasrallah <me@abn.sh>
-Date: Mon, 19 Jul 2021 17:24:41 +0200
-Subject: [PATCH] Revert "Fix MacOS wheels platform tag"
-
-This reverts commit d1e89fd3d7391084cdf35b0806cb5d2a4b413654.
---
- cpydist/__init__.py | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
 diff --git a/cpydist/__init__.py b/cpydist/__init__.py
-index 0e7f341..2619d7a 100644
+index 7fdbaf2..3c427da 100644
 --- a/cpydist/__init__.py
 +++ b/cpydist/__init__.py
-@@ -41,7 +41,7 @@ from distutils.command.install import install
- from distutils.command.install_lib import install_lib
- from distutils.core import Command
- from distutils.dir_util import mkpath, remove_tree
-from distutils.sysconfig import get_config_vars, get_python_version
-+from distutils.sysconfig import get_python_version
- from distutils.version import LooseVersion
- from subprocess import check_call, Popen, PIPE
- 
-@@ -57,9 +57,6 @@ version_py = os.path.join("lib", "mysql", "connector", "version.py")
+@@ -38,7 +38,7 @@ import tempfile
+ from glob import glob
+ from pathlib import Path
+ from subprocess import PIPE, Popen, check_call
+-from sysconfig import get_config_vars, get_python_version
+from sysconfig import get_python_version
+
+ from setuptools import Command
+ from setuptools.command.build_ext import build_ext
+@@ -68,8 +68,6 @@ version_py = os.path.join("lib", "mysql", "connector", "version.py")
 with open(version_py, "rb") as fp:
     exec(compile(fp.read(), version_py, "exec"))
- 
+
 -if "MACOSX_DEPLOYMENT_TARGET" in get_config_vars():
 -    get_config_vars()["MACOSX_DEPLOYMENT_TARGET"] = "11.0"
-
- COMMON_USER_OPTIONS = [
-     ("byte-code-only", None,
-      "remove Python .py files; leave byte code .pyc only"),
-- 
-2.31.1

+ COMMON_USER_OPTIONS = [
+     (
@@ -6,21 +6,30 @@
 , fetchFromGitHub
 , protobuf
 , pythonOlder
-, fetchpatch
+, mysql80
+, openssl
+, pkgs
 }:

 buildPythonPackage rec {
  pname = "mysql-connector";
-  version = "8.0.29";
+  version = "8.0.33";
  format = "setuptools";

  disabled = pythonOlder "3.7";

+  setupPyBuildFlags = [
+    "--with-mysql-capi=\"${mysql80}\""
+    "--with-openssl-include-dir=\"${openssl.dev}/include\""
+    "--with-openssl-lib-dir=\"${lib.getLib openssl}/lib\""
+    "-L \"${lib.getLib pkgs.zstd}/lib:${lib.getLib mysql80}/lib\""
+  ];
+
  src = fetchFromGitHub {
    owner = "mysql";
    repo = "mysql-connector-python";
    rev = version;
-    hash = "sha256-X0qiXNYkNoR00ESUdByPj4dPnEnjLyopm25lm1JvkAk=";
+    hash = "sha256-GtMq7E2qBqFu54hjUotzPyxScTKXNdEQcmgHnS7lBhc=";
  };

  patches = [
@@ -30,17 +39,19 @@ buildPythonPackage rec {
    # 10.12. The patch reverts
    # https://github.com/mysql/mysql-connector-python/commit/d1e89fd3d7391084cdf35b0806cb5d2a4b413654
    ./0001-Revert-Fix-MacOS-wheels-platform-tag.patch
-
-    # Allow for clang to be used to build native extensions
-    (fetchpatch {
-      url = "https://github.com/mysql/mysql-connector-python/commit/fd24ce9dc8c60cc446a8e69458f7851d047c7831.patch";
-      hash = "sha256-WvU1iB53MavCsksKCjGvUl7R3Ww/38alxxMVzjpr5Xg=";
-    })
  ];

+  nativeBuildInputs = [
+    mysql80
+  ];
+
+
  propagatedBuildInputs = [
    dnspython
    protobuf
+    mysql80
+    openssl
+    pkgs.zstd
  ];

  pythonImportsCheck = [
@@ -2,14 +2,14 @@

 buildPythonPackage rec {
  pname = "python_docs_theme";
-  version = "2023.3.1";
+  version = "2023.7";
  format = "flit";

  src = fetchFromGitHub {
    owner = "python";
    repo = "python-docs-theme";
-    rev = version;
-    sha256 = "sha256-WyO5Xc67k5ExB4eCFd17sZCBMaV5djle9BAM0tn5CPc=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-43/TlgYm7Q4ZtY25MiLU9fd1atDmiDUeUK6AYfDfmag=";
  };

  propagatedBuildInputs = [ sphinx ];
@@ -0,0 +1,32 @@
+{ lib, fetchFromGitHub, buildPythonPackage, dateutils }:
+
+buildPythonPackage rec {
+  pname = "pytimeparse2";
+  version = "1.7.1";
+
+  src = fetchFromGitHub {
+    owner = "onegreyonewhite";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-zWRbSohTvbVd3GcRRoxH/UReVGYHC0YmbNgbt8N0X48=";
+  };
+
+  propagatedBuildInputs = [ dateutils ];
+
+  # custom checks, see
+  # https://github.com/onegreyonewhite/pytimeparse2/blob/e00df7506b6925f2c6a5783e89e9f239d128271a/tox.ini#L36C20-L36C78
+  checkPhase = ''
+    runHook preCheck
+    python tests.py -vv --failfast
+    runHook postCheck
+  '';
+
+  pythonImportsCheck = [ "pytimeparse2" ];
+
+  meta = with lib; {
+    description = "A pytimeparse based project with the aim of optimizing functionality and providing stable support";
+    homepage = "https://github.com/onegreyonewhite/pytimeparse2";
+    license = licenses.mit;
+    maintainers = with maintainers; [ gador ];
+  };
+}
@@ -37,6 +37,6 @@ buildPythonPackage rec {
    description = "Unofficial Python API for TIDAL music streaming service";
    homepage = "https://github.com/tamland/python-tidal";
    license = licenses.gpl3;
-    maintainers = [ maintainers.rodrgz ];
+    maintainers = [ ];
  };
 }
@@ -6,14 +6,14 @@

 buildPythonPackage rec {
  pname = "uritools";
-  version = "4.0.1";
+  version = "4.0.2";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-78XDpt4FQEhQaFqNPzTahHa1aqNRb7+O/1yHBMeigm8=";
+    hash = "sha256-BN8reH0Ot2IA6DGTgqA1Yvv+R0H9ZsFVBrCNO4IR1XM=";
  };

  pythonImportsCheck = [
@@ -12,16 +12,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "prqlc";
-  version = "0.9.3";
+  version = "0.9.4";

  src = fetchFromGitHub {
    owner = "prql";
    repo = "prql";
    rev = version;
-    hash = "sha256-m5W7ddGlgxaQR+nCFygfLWU6QBDUOK9POPdR2H62j9Q=";
+    hash = "sha256-9BDBuAaer92BAwQexkZOyt99VXEbJT6/87DoCqVzjcQ=";
  };

-  cargoHash = "sha256-7vjDWiod52fuAPHbB/UmqG9YZb8GvyZGMgdYr2qI+uM=";
+  cargoHash = "sha256-LeMl9t2ZYsBFuGnxJVvfmnjKFVIVO8ChmXQhXcSYV6s=";

  nativeBuildInputs = [
    pkg-config
@@ -2,7 +2,7 @@

 buildGoModule rec {
  pname = "goconst";
-  version = "1.5.1";
+  version = "1.6.0";

  excludedPackages = [ "tests" ];

@@ -10,10 +10,10 @@ buildGoModule rec {
    owner = "jgautheron";
    repo = "goconst";
    rev = "v${version}";
-    sha256 = "sha256-chBWxOy9V4pO3hMaeCoKwnQxIEYiSejUOD3QDBCpaoE=";
+    sha256 = "sha256-gd+0Gm1qANwgYKWAxpU7759BhyURalJCRxd/P6sczc4=";
  };

-  vendorSha256 = null;
+  vendorHash = null;

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

@@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "grpc-gateway";
-  version = "2.16.2";
+  version = "2.17.1";

  src = fetchFromGitHub {
    owner = "grpc-ecosystem";
    repo = "grpc-gateway";
    rev = "v${version}";
-    sha256 = "sha256-oKmT1qvEWNk0q5JnzsUaCWCsllUtyIAsWXUP4DsmgnA=";
+    sha256 = "sha256-zQAfy2dl0YtQGN9MARs9RhoqM/2GFn4iQb/X6vD8HHc=";
  };

-  vendorHash = "sha256-YqDQ6dQQDzkehRN0jWmfjG4acB4rtL2HGHOl71IM8Lk=";
+  vendorHash = "sha256-2VkUQ6NhoRJY3qRS41igZ7U/908uWgkHaQ9V2veo1j8=";

  meta = with lib; {
    description =
@@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "oxlint";
-  version = "0.0.11";
+  version = "0.0.12";

  src = fetchFromGitHub {
    owner = "web-infra-dev";
    repo = "oxc";
    rev = "oxlint_v${version}";
-    hash = "sha256-di+uCLZJNJMETMSUxQwlFaZPJps0+HIL7h+EvudP5II=";
+    hash = "sha256-/8h06MpkrOBg+bQ7yi9MDiYFGFhgFLjtBXBxvaOCnwI=";
  };

-  cargoHash = "sha256-r+HRm9JNFKFL78VP/Yz87b1nQDLwbNuhHd0JkXeuCC0=";
+  cargoHash = "sha256-syc+kQq0kiuXUw7MFw02GoZM91syS0P5sQI6ns8z0ys=";

  buildInputs = lib.optionals stdenv.isDarwin [
    darwin.apple_sdk.frameworks.Security
@@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-watch";
-  version = "8.4.0";
+  version = "8.4.1";

  src = fetchFromGitHub {
    owner = "watchexec";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-YwiTzIO60ct076vMoK9BHKa65Qet2PAvPRwnZcjDgcM=";
+    hash = "sha256-7nln9kuEVt8/NQ3BDdezSNfTyYo6qL2P2m5ZhQ7dAI8=";
  };

-  cargoHash = "sha256-BzcKWQSB94H3XOsbwNvJoAHlZwkJvLABIrfFh9Ugfig=";
+  cargoHash = "sha256-0D+aM/zap5UDQ+k9c/p+ZfN1OUjDzFRArvcmqEOcBbM=";

  buildInputs = lib.optionals stdenv.isDarwin [ Cocoa CoreServices Foundation libiconv ];

@@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "typos";
-  version = "1.16.10";
+  version = "1.16.11";

  src = fetchFromGitHub {
    owner = "crate-ci";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-YFHy7oD0phUJTKFPnRLm5S3p4tE9MEHe3HnhuyyIwIc=";
+    hash = "sha256-6CinLQ3wdVG1Ry7nskbC4JlhwT9rlJiP1oc4ks1t7Ts=";
  };

-  cargoHash = "sha256-oQ1yMhHwcMHk7+nj4eqL3Ws0buyh9cGXVdNe4zNX9OI=";
+  cargoHash = "sha256-S7cMbnelsUfP8t93jqv0PY50fN/XtkphKhiKfe2fE/c=";

  meta = with lib; {
    description = "Source code spell checker";
@@ -14,16 +14,16 @@

 buildGoModule rec {
  pname = "wails";
-  version = "2.5.1";
+  version = "2.6.0";

  src = fetchFromGitHub {
    owner = "wailsapp";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-4JTkViqJ1rmVg6JGJ+uZrIo/mh6o1VE39gYoILdFWBE=";
+    sha256 = "sha256-jY+2I4SOr6gr2MCLrBBE9H0T1sTB13kEb1OJ717kWqg=";
  } + "/v2";

-  vendorSha256 = "sha256-RiectpUhm24xjgfPZEMDVFSEzPtIjn7L/qC2KE2s5aw=";
+  vendorSha256 = "sha256-56LZQQzfFQTa4fo5bdZtK/VzNDBPyI9hDG4RkP38gcI=";

  proxyVendor = true;

@@ -14,14 +14,14 @@

 clangStdenv.mkDerivation rec {
  pname = "ananicy-cpp";
-  version = "1.1.0";
+  version = "1.1.1";

  src = fetchFromGitLab {
    owner = "ananicy-cpp";
    repo = "ananicy-cpp";
    rev = "v${version}";
    fetchSubmodules = true;
-    sha256 = "sha256-BomtP9KcipBJuZjra/ojRyJi+pgktxGGEdt86N1H9Hc=";
+    sha256 = "sha256-oPinSc00+Z6SxjfTh7DttcXSjsLv1X0NI+O37C8M8GY=";
  };

  strictDeps = true;
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
  postInstall = (if libOnly then ''
    rm -rf $out/{bin,share}
    rm -rf $out/lib/{jack,libjacknet*,libjackserver*}
-  '' else ''
+  '' else lib.optionalString (optDbus != null) ''
    wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH
  '');

@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "C Library for NVM Express on Linux";
    homepage = "https://github.com/linux-nvme/libnvme";
-    maintainers = with maintainers; [ zseri ];
+    maintainers = [ maintainers.fogti ];
    license = with licenses; [ lgpl21Plus ];
    platforms = platforms.linux;
  };
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "ZBC device manipulation library";
    homepage = "https://github.com/westerndigitalcorporation/libzbc";
-    maintainers = with maintainers; [ zseri ];
+    maintainers = [ maintainers.fogti ];
    license = with licenses; [ bsd2 lgpl3Plus ];
    platforms = platforms.linux;
  };
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "Zoned block device manipulation library and tools";
    homepage = "https://github.com/westerndigitalcorporation/libzbd";
-    maintainers = with maintainers; [ zseri ];
+    maintainers = [ maintainers.fogti ];
    license = with licenses; [ lgpl3Plus gpl3Plus ];
    platforms = platforms.linux;
  };
@@ -1,14 +1,16 @@
-{ lib, stdenv, fetchFromGitHub, kernel, kmod, gnugrep, vmware-workstation }:
+{ lib, stdenv, fetchFromGitHub, kernel, kmod, gnugrep }:

 stdenv.mkDerivation rec {
  pname = "vmware-modules";
-  version = "${vmware-workstation.version}-${kernel.version}";
+  version = "workstation-17.0.2-2023-08-12-${kernel.version}";

  src = fetchFromGitHub {
    owner = "mkubecek";
    repo = "vmware-host-modules";
-    rev = "w${vmware-workstation.version}";
-    sha256 = "sha256-EHMiSmljpUjYuZH6r/0Vk5OVGeyQyNngy0AVJO/48a0=";
+    # Developer no longer provides tags for kernel compatibility fixes
+    # Commit hash for branch workstation-17.0.2 as of 2023-08-12
+    rev = "8b2d31498a8df9b1215f407c989b065953b73455";
+    sha256 = "sha256-R0nY4O3ASQkOop+ddU4k72HiIJU/aJz0l3lkJN/kuHc=";
  };

  hardeningDisable = [ "pic" ];
@@ -1,4 +1,4 @@
-From 3ec6fce101083d4f23641fd015cbe4ade317ad59 Mon Sep 17 00:00:00 2001
+From 231ee836e357b83cc2fc0a3a977f74839308ec68 Mon Sep 17 00:00:00 2001
 From: Ember Keske <git@n0emis.eu>
 Date: Wed, 2 Aug 2023 06:36:02 +0200
 Subject: [PATCH 1/2] Define configs with env vars
@@ -11,7 +11,7 @@ Subject: [PATCH 1/2] Define configs with env vars
 4 files changed, 6 insertions(+), 6 deletions(-)

 diff --git a/app.php b/app.php
-index 31905be6..30b3eb82 100644
+index bc5b1b39..26f7687e 100644
 --- a/app.php
 +++ b/app.php
@@ -12,7 +12,7 @@ use Slim\Views\Blade;
@@ -23,16 +23,16 @@ index 31905be6..30b3eb82 100644
 require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones
 require_once __DIR__ . '/helpers/ConfigurationValidator.php';
 
-@@ -63,7 +63,7 @@ $app = AppFactory::create();
- 
+@@ -64,7 +64,7 @@ $app = AppFactory::create();
 $container = $app->getContainer();
- $container->set('view', function (Container $container) {
+ $container->set('view', function (Container $container)
+ {
 -	return new Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
 +	return new Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR'));
 });
 
- $container->set('UrlManager', function (Container $container) {
-@@ -103,7 +103,7 @@ $errorMiddleware->setDefaultErrorHandler(
+ $container->set('UrlManager', function (Container $container)
+@@ -106,7 +106,7 @@ $errorMiddleware->setDefaultErrorHandler(
 
 $app->add(new CorsMiddleware($app->getResponseFactory()));
 
@@ -42,10 +42,10 @@ index 31905be6..30b3eb82 100644
 ob_clean(); // No response output before here
 $app->run();
 diff --git a/services/DatabaseService.php b/services/DatabaseService.php
-index be5486b6..b6091ee7 100644
+index 4a05bda1..ce41ed17 100644
 --- a/services/DatabaseService.php
 +++ b/services/DatabaseService.php
-@@ -104,6 +104,6 @@ class DatabaseService
+@@ -125,6 +125,6 @@ class DatabaseService
 			return GROCY_DATAPATH . '/grocy_' . $dbSuffix . '.db';
 		}
 
@@ -67,10 +67,10 @@ index 7d070350..a6dd4b08 100644
 		{
 			mkdir($this->StoragePath);
 diff --git a/services/StockService.php b/services/StockService.php
-index 16cb468c..23228803 100644
+index 7265e82b..13af591a 100644
 --- a/services/StockService.php
 +++ b/services/StockService.php
-@@ -1769,7 +1769,7 @@ class StockService extends BaseService
+@@ -1761,7 +1761,7 @@ class StockService extends BaseService
 			throw new \Exception('No barcode lookup plugin defined');
 		}
 
@@ -1,4 +1,4 @@
-From 0e834aa0ef712ce97acf24c05c43a04387fda18c Mon Sep 17 00:00:00 2001
+From b532add2d1287489d4541e79c976bb77795696cd Mon Sep 17 00:00:00 2001
 From: Ember Keske <git@n0emis.eu>
 Date: Wed, 2 Aug 2023 06:36:46 +0200
 Subject: [PATCH 2/2] Remove check for config-file as it's stored in /etc/grocy
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "grocy";
-  version = "4.0.0";
+  version = "4.0.2";

  src = fetchurl {
    url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip";
-    sha256 = "sha256-Sei+UYM5azzSWgnmgufxDl5ySbYJ52DBGPc0nTjnqqc=";
+    sha256 = "sha256-ZhXfZKmfg8lSzEAGIj7LMIfvaHG1FY5j+/OpOCTxm3c=";
  };

  nativeBuildInputs = [ unzip ];
@@ -2,16 +2,16 @@

 buildNpmPackage rec {
  pname = "uptime-kuma";
-  version = "1.22.1";
+  version = "1.23.0";

  src = fetchFromGitHub {
    owner = "louislam";
    repo = "uptime-kuma";
    rev = version;
-    hash = "sha256-thLhJF6+DS4plqKWYidb1e/KW5PvPf/Gc2iH2SEooYw=";
+    hash = "sha256-868hyugz/YJaCs4dJJ4OKHi5jx/e4ScjMBxGaNGUhe0=";
  };

-  npmDepsHash = "sha256-CZfWsjtooxa6BJ5ieptUuYSQ7Ve/uVbdMPLEn2+WAX4=";
+  npmDepsHash = "sha256-vULtoWNqvT4RW1Q1l0+9p65cZ0TZEUnhCw0/bANsjOo=";

  patches = [
    # Fixes the permissions of the database being not set correctly
@@ -0,0 +1,33 @@
+{ stdenv
+, lib
+, fetchurl
+, openssl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "stone";
+  version = "2.4";
+
+  src = fetchurl {
+    url = "http://www.gcd.org/sengoku/stone/stone-${version}.tar.gz";
+    hash = "sha256-1dwa9uxdpQPypAs98/4ZqPv5085pa49G9NU9KsjY628=";
+  };
+
+  buildInputs = [ openssl ];
+
+  makeFlags = [ "linux-ssl" ];
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 stone -t $out/bin
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A TCP/IP repeater in the application layer";
+    homepage = "http://www.gcd.org/sengoku/stone/";
+    license = licenses.gpl2Only;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ corngood ];
+  };
+}
@@ -2,13 +2,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "agdsn-zsh-config";
-  version = "0.7.0";
+  version = "0.7.1";

  src = fetchFromGitHub {
    owner = "agdsn";
    repo = "agdsn-zsh-config";
    rev = "v${version}";
-    sha256 = "sha256-HMISWAZYLpKtd3oi7vEKCWwVaJCQXUon7KYo2jj+IjE=";
+    sha256 = "sha256-79bD3YQcpNTKYvEoKu22gqOKvNH7eZPGS/iU+/4IbAU=";
  };

  dontBuild = true;
@@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "simplotask";
-  version = "1.11.4";
+  version = "1.11.5";

  src = fetchFromGitHub {
    owner = "umputun";
    repo = "spot";
    rev = "v${version}";
-    hash = "sha256-G/T7LF8ujlCSbK1Lv2h43OZVx52yrLDr+6e/WxhaHOo=";
+    hash = "sha256-ZPmYAUfkWo+inD2CwzT4Hncsshk3Y2W6aldy/5v1sks=";
  };

  vendorHash = null;
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
    description = "Convert a .rpm file to a .tar.gz archive";
    homepage = "http://slackware.com/config/packages.php";
    license = licenses.bsd1;
-    maintainers = with maintainers; [ zseri ];
+    maintainers = [ maintainers.fogti ];
    platforms = platforms.all;
  };
 }
@@ -50,7 +50,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "ventoy";
-  version = "1.0.94";
+  version = "1.0.95";

  src =
    let
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
    in
    fetchurl {
      url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz";
-      hash = "sha256-dVcr0qDG95QC9ay1Sbhs9IxCGzpLvej2XRmje29fWhQ=";
+      hash = "sha256-Tsi541GAMrWBl5xLo/K+uEyaoaDSWvwp5RMzZ5V6RAU=";
    };

  patches = [
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
    '';
    homepage = "https://www.digitemp.com";
    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ zseri ];
+    maintainers = [ maintainers.fogti ];
    platforms = platforms.unix;
  };
 }
@@ -1,63 +0,0 @@
-{ lib
-, gitSupport ? true
-, stdenv
-, fetchFromGitHub
-, rustPlatform
-, cmake
-, pandoc
-, pkg-config
-, zlib
-, Security
-, libiconv
-, installShellFiles
-}:
-
-rustPlatform.buildRustPackage {
-  pname = "exa";
-  version = "unstable-2023-03-01";
-
-  src = fetchFromGitHub {
-    owner = "ogham";
-    repo = "exa";
-    rev = "c697d066702ab81ce0684fedb4c638e0fc0473e8";
-    hash = "sha256-sSEnZLL0n7Aw72fPNJmyRxSLXCMC5uWwfTy2fpsuo6c=";
-  };
-
-  cargoHash = "sha256-/sxiQMWix4GR12IzuvXbx56mZhbcFpd+NJ49S2N+jzw=";
-
-  nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
-  buildInputs = [ zlib ]
-    ++ lib.optionals stdenv.isDarwin [ libiconv Security ];
-
-  buildNoDefaultFeatures = true;
-  buildFeatures = lib.optional gitSupport "git";
-
-  outputs = [ "out" "man" ];
-
-  postInstall = ''
-    pandoc --standalone -f markdown -t man man/exa.1.md > man/exa.1
-    pandoc --standalone -f markdown -t man man/exa_colors.5.md > man/exa_colors.5
-    installManPage man/exa.1 man/exa_colors.5
-    installShellCompletion \
-      --bash completions/bash/exa \
-      --fish completions/fish/exa.fish \
-      --zsh completions/zsh/_exa
-  '';
-
-  meta = with lib; {
-    description = "Replacement for 'ls' written in Rust";
-    longDescription = ''
-      exa is a modern replacement for ls. It uses colours for information by
-      default, helping you distinguish between many types of files, such as
-      whether you are the owner, or in the owning group. It also has extra
-      features not present in the original ls, such as viewing the Git status
-      for a directory, or recursing into directories with a tree view. exa is
-      written in Rust, so it’s small, fast, and portable.
-    '';
-    changelog = "https://github.com/ogham/exa/releases";
-    homepage = "https://the.exa.website";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ehegnes lilyball globin fortuneteller2k ];
-    mainProgram = "exa";
-  };
-}
@@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "ripdrag";
-  version = "0.4.3";
+  version = "0.4.4";

  src = fetchFromGitHub {
    owner = "nik012003";
    repo = "ripdrag";
    rev = "v${version}";
-    hash = "sha256-SvGJb/XosR8T/bg7nhjXR15Ba1MLaerJvoetYDtgHiM=";
+    hash = "sha256-GWNu970nyD4E2mWghOtHnuvVYGhgZ87zNCNxSpxOsgQ=";
  };

-  cargoHash = "sha256-O/Xp+dZ+Pv1/yNS/KYbF2wQguq/udtJlRPeP4v3U0Vs=";
+  cargoHash = "sha256-aN+25hhE6LhI8M+enyzsfSTARIxbY36mdeP70rjBJQ8=";

  nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];

@@ -0,0 +1,24 @@
+{ lib, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "rot8";
+  version = "0.1.5";
+
+  src = fetchFromGitHub {
+    owner = "efernau";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-i+VLVA/XKZiFPEeFHR3CpZKi8CWA/tiaZJerciqQHJ0=";
+  };
+
+  cargoHash = "sha256-Zz3RK79pMBn9JcpOVHf8vrvQzOJuV7anm136HcTBhJE=";
+
+  meta = with lib; {
+    description = "screen rotation daemon for X11 and sway";
+    homepage = "https://github.com/efernau/rot8";
+    license = licenses.mit;
+    maintainers = [ maintainers.smona ];
+    mainProgram = pname;
+    platforms = platforms.linux;
+  };
+}
@@ -1,57 +1,37 @@
 { lib
 , fetchFromGitHub
-, python3
+, python3Packages
 , nixosTests
 , testers
 , sqlite3-to-mysql
 , fetchPypi
+, mysql80
 }:

-let
-  py = python3.override {
-    packageOverrides = self: super: {
-      # sqlite3-to-mysql is incompatible with versions > 1.4.44 of sqlalchemy
-      sqlalchemy = super.sqlalchemy.overridePythonAttrs rec {
-        version = "1.4.44";
-        format = "setuptools";
-        src = fetchPypi {
-          pname = "SQLAlchemy";
-          inherit version;
-          hash = "sha256-LdpflnGa6Js+wPG3lpjYbrmuyx1U6ZCrs/3ZLAS0apA=";
-        };
-        disabledTestPaths = [
-           "test/aaa_profiling"
-           "test/ext/mypy"
-        ];
-      };
-    };
-    self = py;
-  };
-
-in
-with py.pkgs; buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
  pname = "sqlite3-to-mysql";
-  version = "1.4.19";
+  version = "2.0.3";
  format = "pyproject";

+  disabled = python3Packages.pythonOlder "3.7";
+
  src = fetchFromGitHub {
    owner = "techouse";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-gtXwDLHl5f1sXLm+b8l08bY/XJkN+zVtd7m45K0CAYY=";
+    hash = "sha256-rlKJKthop9BQnqjTUq1hZM/NP69gPdEFTq1rU+CbpWA=";
  };

-  nativeBuildInputs = [
-    setuptools
+  nativeBuildInputs = with python3Packages; [
+    hatchling
  ];

-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3Packages; [
    click
    mysql-connector
-    pytimeparse
+    pytimeparse2
    pymysql
    pymysqlsa
-    six
    simplejson
    sqlalchemy
    sqlalchemy-utils
@@ -59,6 +39,7 @@ with py.pkgs; buildPythonApplication rec {
    tabulate
    unidecode
    packaging
+    mysql80
  ];

  # tests require a mysql server instance
@@ -0,0 +1,29 @@
+{ lib
+, stdenv
+, rustPlatform
+, fetchFromGitHub
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "srisum";
+  version = "5.0.0";
+
+  src = fetchFromGitHub {
+    owner = "zkat";
+    repo = "srisum-rs";
+    rev = "v${version}";
+    hash = "sha256-Nw3uTGOcz1ivAm9X+PnOdNA937wuK3vtJQ0iJHlHVdw=";
+  };
+  cargoHash = "sha256-q6FGykY+HmU3/jMaGRO36OlYGVLG9mU8yZ8j/Shux3s=";
+
+  doInstallCheck = true;
+
+  meta = with lib; {
+    description = "A command-line utility to compute and check subresource integrity hashes";
+    homepage = "https://github.com/zkat/srisum-rs";
+    changelog = "https://github.com/zkat/srisum-rs/raw/v${version}/CHANGELOG.md";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ pjjw ];
+    platforms = platforms.all;
+  };
+}
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {

  src =
    fetchurl {
-      url = "https://staruml-7a0.kxcdn.com/releases-v5/StarUML_${version}_amd64.deb";
+      url = "https://files.staruml.io/releases-v5/StarUML_${version}_amd64.deb";
      sha256 = "sha256-da1mY3OW24g6Ix0L57CBPbaMeSLzhOOjoBsyZszmNOc=";
    };

@@ -7,24 +7,26 @@
 , pango
 , atk
 , gdk-pixbuf
-, gtk3
+, gtk4
+, wrapGAppsHook
 }:

 rustPlatform.buildRustPackage rec {
  pname = "szyszka";
-  version = "2.0.0";
+  version = "3.0.0";

  src = fetchFromGitHub {
    owner = "qarmin";
-    repo = pname;
+    repo = "szyszka";
    rev = version;
-    sha256 = "sha256-TQwDvkWWlk09kVVaVI56isJi+X9UXWnoz+2PVyK9BGc=";
+    hash = "sha256-LkXGKDFKaY+mg53ZEO4h2br/4eRle/QbSQJTVEMpAoY=";
  };

-  cargoSha256 = "sha256-2uyMA2nIOPkc5+qImFn3eUVq2AxHu3Xj91TpkKswjao=";
+  cargoHash = "sha256-WJR1BogNnQoZeOt5yBFzjYNZS8OmE84R1FbQpHTb7V0=";

  nativeBuildInputs = [
    pkg-config
+    wrapGAppsHook
  ];

  buildInputs = [
@@ -33,13 +35,13 @@ rustPlatform.buildRustPackage rec {
    pango
    atk
    gdk-pixbuf
-    gtk3
+    gtk4
  ];

  meta = with lib; {
    description = "A simple but powerful and fast bulk file renamer";
    homepage = "https://github.com/qarmin/szyszka";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
    maintainers = with maintainers; [ kranzes ];
  };
 }
@@ -30,6 +30,6 @@ buildPythonApplication rec {
    description = "unified temperature fetcher interface to several UPS network adapters";
    homepage = "https://github.com/YZITE/APC_Temp_fetch";
    license = licenses.asl20;
-    maintainers = [ maintainers.zseri ];
+    maintainers = [ maintainers.fogti ];
  };
 }
@@ -16,6 +16,7 @@
 , qmltermwidget
 , qtbase
 , qtdeclarative
+, qtgraphicaleffects
 , qtinstaller
 , qtquickcontrols
 , qtquickcontrols2
@@ -25,14 +26,14 @@
 , provider ? "riseup"
 }:
 let
-  version = "0.21.6";
+  version = "0.21.11";

  src = fetchFromGitLab {
    domain = "0xacab.org";
    owner = "leap";
    repo = "bitmask-vpn";
    rev = version;
-    sha256 = "sha256-LMz+ZgQVFGujoLA8rlyZ3VnW/NSlPipD5KwCe+cFtnY=";
+    sha256 = "sha256-mhmKG6Exxh64oeeeLezJYWEw61iIHLasHjLomd2L8P4=";
  };

  # bitmask-root is only used on GNU/Linux
@@ -98,7 +99,6 @@ buildGoModule rec {
    pkg-config
    python3Packages.wrapPython
    qmake
-    qtquickcontrols
    qtquickcontrols2
    qttools
    which
@@ -109,6 +109,9 @@ buildGoModule rec {
    qtbase
    qmltermwidget
    qtdeclarative
+    qtgraphicaleffects
+    qtquickcontrols
+    qtquickcontrols2
  ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ];
  # FIXME: building on Darwin currently fails
  # due to missing debug symbols for Qt,
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  version = "0.0.2";

  src = fetchFromGitHub {
-    owner = "zseri";
+    owner = "fogti";
    repo = "zs-apc-spdu-ctl";
    rev = "v${version}";
    sha256 = "TMV9ETWBVeXq6tZ2e0CrvHBXoyKfOLCQurjBdf/iw/M=";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "APC SPDU control utility";
    license = licenses.mit;
-    maintainers = with maintainers; [ zseri ];
+    maintainers = [ maintainers.fogti ];
    platforms = platforms.linux;
  };
 }
--- a/Show More
+++ b/Show More