Merge remote-tracking branch 'origin/master' into haskell-updates

2024-11-27 01:13:05 +00:00 · 2023-06-14 14:28:38 +02:00 · 2023-06-14 14:28:38 +02:00 · 7d0a1bdb8f
commit 7d0a1bdb8f
parent f8cc343111 8af638e3d7
99 changed files with 9242 additions and 452 deletions
--- a/doc/languages-frameworks/nim.section.md
+++ b/doc/languages-frameworks/nim.section.md
@ -15,32 +15,23 @@ case of packages not containing exported library code the attribute
 The following example shows a Nim program that depends only on Nim libraries:

 ```nix
-{ lib, nimPackages, fetchurl }:
-
-nimPackages.buildNimPackage rec {
-  pname = "hottext";
-  version = "1.4";
+{ lib, nimPackages, fetchFromGitHub }:

+nimPackages.buildNimPackage (finalAttrs: {
+  pname = "ttop";
+  version = "1.0.1";
  nimBinOnly = true;

-  src = fetchurl {
-    url = "https://git.sr.ht/~ehmry/hottext/archive/v${version}.tar.gz";
-    hash = "sha256-hIUofi81zowSMbt1lUsxCnVzfJGN3FEiTtN8CEFpwzY=";
+  src = fetchFromGitHub {
+    owner = "inv2004";
+    repo = "ttop";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-x4Uczksh6p3XX/IMrOFtBxIleVHdAPX9e8n32VAUTC4=";
  };

-  buildInputs = with nimPackages; [
-    bumpy
-    chroma
-    flatty
-    nimsimd
-    pixie
-    sdl2
-    typography
-    vmath
-    zippy
-  ];
-}
+  buildInputs = with nimPackages; [ asciigraph illwill parsetoml zippy ];

+})
 ```

 ## Nim library packages in Nixpkgs {#nim-library-packages-in-nixpkgs}
@ -60,15 +51,16 @@ non-Nim package:
 ```nix
 { lib, buildNimPackage, fetchNimble, SDL2 }:

-buildNimPackage rec {
+buildNimPackage (finalAttrs: {
  pname = "sdl2";
  version = "2.0.4";
  src = fetchNimble {
-    inherit pname version;
-    hash = "sha256-qDtVSnf+7rTq36WAxgsUZ8XoUk4sKwHyt8EJcY5WP+o=";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-Vtcj8goI4zZPQs2TbFoBFlcR5UqDtOldaXSH/+/xULk=";
  };
  propagatedBuildInputs = [ SDL2 ];
-}
+  doCheck = true;
+})
 ```

 ## `buildNimPackage` parameters {#buildnimpackage-parameters}
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@ -553,7 +553,7 @@ In addition to numerous new and updated packages, this release has the following

 - `buildDunePackage` now defaults to `strictDeps = true` which means that any library should go into `buildInputs` or `checkInputs`. Any executable that is run on the building machine should go into `nativeBuildInputs` or `nativeCheckInputs` respectively. Example of executables are `ocaml`, `findlib` and `menhir`. PPXs are libraries which are built by dune and should therefore not go into `nativeBuildInputs`.

- `buildFHSUserEnv` is now called `buildFHSEnv` and uses FlatPak's Bubblewrap sandboxing tool rather than Nixpkgs' own chrootenv. The old chrootenv-based implemenation is still available via `buildFHSEnvChrootenv` but is considered deprecated and will be removed when the remaining uses inside Nixpkgs have been migrated. If your FHSEnv-wrapped application misbehaves when using the new bubblewrap implementation, please create an issue in Nixpkgs.
+- `buildFHSUserEnv` is now called `buildFHSEnv` and uses FlatPak's Bubblewrap sandboxing tool rather than Nixpkgs' own chrootenv. The old chrootenv-based implemenation is still available via `buildFHSEnvChroot` but is considered deprecated and will be removed when the remaining uses inside Nixpkgs have been migrated. If your FHSEnv-wrapped application misbehaves when using the new bubblewrap implementation, please create an issue in Nixpkgs.

 - Top-level `buildPlatform`, `hostPlatform`, `targetPlatform` have been deprecated, use `stdenv.X` instead.

--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@ -381,7 +381,8 @@ in {
        type = types.str;
        description = lib.mdDoc ''
          The full path to a file that contains the admin's password. Must be
-          readable by user `nextcloud`.
+          readable by user `nextcloud`. The password is set only in the initial
+          setup of nextcloud by the systemd `nextcloud-setup.service`.
        '';
      };

--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@ -58,14 +58,14 @@
 }:
 stdenv.mkDerivation rec {
  pname = "ardour";
-  version = "7.3";
+  version = "7.4";

  # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org
  # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.
  src = fetchgit {
    url = "git://git.ardour.org/ardour/ardour.git";
    rev = version;
-    hash = "sha256-fDZGmKQ6qgENkq8NY/J67Jym+IXoOYs8DT4xyPXLcC4=";
+    hash = "sha256-CUGhJi3ji0F6v41Y08sQvo7oKITOJ96ojdJL+FyCxmw=";
  };

  bundledContent = fetchzip {
--- a/pkgs/applications/audio/faust/faust2alqt.nix
+++ b/pkgs/applications/audio/faust/faust2alqt.nix
@ -1,15 +1,41 @@
 { faust
 , alsa-lib
-, qt4
+, qtbase
+, writeText
+, makeWrapper
 }:
-
+let
+  # Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH
+  wrapBinary = writeText "wrapBinary" ''
+    source ${makeWrapper}/nix-support/setup-hook
+    for p in $FILES; do
+      workpath=$PWD
+      cd -- "$(dirname "$p")"
+      binary=$(basename --suffix=.dsp "$p")
+      rm -f .$binary-wrapped
+      wrapProgram $binary --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}"
+      sed -i $binary -e 's@exec@cd "$(dirname "$(readlink -f "''${BASH_SOURCE[0]}")")" \&\& exec@g'
+      cd $workpath
+    done
+  '';
+in
 faust.wrapWithBuildEnv {

  baseName = "faust2alqt";

  propagatedBuildInputs = [
    alsa-lib
-    qt4
+    qtbase
  ];

+  dontWrapQtApps = true;
+
+  preFixup = ''
+    for script in "$out"/bin/*; do
+      # append the wrapping code to the compilation script
+      cat ${wrapBinary} >> $script
+      # prevent the qmake error when running the script
+      sed -i "/QMAKE=/c\ QMAKE="${qtbase.dev}/bin/qmake"" $script
+    done
+  '';
 }
--- a/pkgs/applications/audio/faust/faust2jaqt.nix
+++ b/pkgs/applications/audio/faust/faust2jaqt.nix
@ -1,11 +1,27 @@
 { faust
 , jack2
-, qt4
+, qtbase
 , libsndfile
 , alsa-lib
+, writeText
+, makeWrapper
 , which
 }:
-
+let
+  # Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH
+  wrapBinary = writeText "wrapBinary" ''
+    source ${makeWrapper}/nix-support/setup-hook
+    for p in $FILES; do
+      workpath=$PWD
+      cd -- "$(dirname "$p")"
+      binary=$(basename --suffix=.dsp "$p")
+      rm -f .$binary-wrapped
+      wrapProgram $binary --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}"
+      sed -i $binary -e 's@exec@cd "$(dirname "$(readlink -f "''${BASH_SOURCE[0]}")")" \&\& exec@g'
+      cd $workpath
+    done
+  '';
+in
 faust.wrapWithBuildEnv {

  baseName = "faust2jaqt";
@ -17,10 +33,21 @@ faust.wrapWithBuildEnv {

  propagatedBuildInputs = [
    jack2
-    qt4
+    qtbase
    libsndfile
    alsa-lib
    which
  ];

+
+  dontWrapQtApps = true;
+
+  preFixup = ''
+    for script in "$out"/bin/*; do
+      # append the wrapping code to the compilation script
+      cat ${wrapBinary} >> $script
+      # prevent the qmake error when running the script
+      sed -i "/QMAKE=/c\ QMAKE="${qtbase.dev}/bin/qmake"" $script
+    done
+  '';
 }
--- a/pkgs/applications/audio/faust/faust2lv2.nix
+++ b/pkgs/applications/audio/faust/faust2lv2.nix
@ -1,15 +1,19 @@
 { boost
 , faust
 , lv2
-, qt4
+, qtbase
 , which
-
 }:

 faust.wrapWithBuildEnv {

  baseName = "faust2lv2";

-  propagatedBuildInputs = [ boost lv2 qt4 which ];
+  propagatedBuildInputs = [ boost lv2 qtbase ];

+  dontWrapQtApps = true;
+
+  preFixup = ''
+    sed -i "/QMAKE=/c\ QMAKE="${qtbase.dev}/bin/qmake"" "$out"/bin/faust2lv2;
+  '';
 }
--- a/pkgs/applications/audio/faustPhysicalModeling/default.nix
+++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix
@ -12,6 +12,8 @@ stdenv.mkDerivation rec {

  buildInputs = [ faust2jaqt faust2lv2 ];

+  dontWrapQtApps = true;
+
  buildPhase = ''
    cd examples/physicalModeling

--- a/pkgs/applications/audio/faustStk/default.nix
+++ b/pkgs/applications/audio/faustStk/default.nix
@ -1,40 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }:
-
-stdenv.mkDerivation rec {
-  pname = "faustPhhysicalModeling";
-  version = "2.20.2";
-
-  src = fetchFromGitHub {
-    owner = "grame-cncm";
-    repo = "faust";
-    rev = version;
-    sha256 = "1mm93ba26b7q69hvabzalg30dh8pl858nj4m2bb57pznnp09lq9a";
-  };
-
-  buildInputs = [ faust2jaqt faust2lv2 ];
-
-  buildPhase = ''
-    cd examples/physicalModeling/faust-stk
-
-    for f in *.dsp; do
-      faust2jaqt -time -vec  -midi -nvoices 8 -t 99999 $f
-      faust2lv2  -time -vec -double -gui -nvoices 32 -t 99999 $f
-    done
-  '';
-
-  installPhase = ''
-    mkdir -p $out/lib/lv2 $out/bin
-    mv *.lv2/ $out/lib/lv2
-    for f in $(find . -executable -type f); do
-      cp $f $out/bin/
-    done
-  '';
-  meta = with lib; {
-    broken = (stdenv.isLinux && stdenv.isAarch64);
-    description = "The physical modeling instruments included with faust, compiled as jack standalone and lv2 instruments";
-    homepage = "https://ccrma.stanford.edu/~rmichon/faustSTK/";
-    license = licenses.stk;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ magnetophon ];
-  };
-}
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@ -1,18 +1,27 @@
-{ lib, fetchFromGitHub, python3, python3Packages, intltool
-, glibcLocales, gnome, gtk3, wrapGAppsHook
+{ lib
+, fetchFromGitHub
+, gitUpdater
+, glibcLocales
+, gnome
 , gobject-introspection
+, gtk3
+, intltool
+, python3
+, python3Packages
+, wrapGAppsHook
+, xdg-utils
 }:

 python3Packages.buildPythonApplication rec {
  pname = "gpodder";
-  version = "3.10.21";
+  version = "3.11.1";
  format = "other";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = version;
-    sha256 = "0n73jm5ypsj962gpr0dk10lqh83giqsczm63wchyhmrkyf1wgga1";
+    sha256 = "Ns03MFhd4ZLtyeQTLTgLWY2Ot6gmrksFMOZm8jFaLIg=";
  };

  patches = [
@ -72,6 +81,10 @@ python3Packages.buildPythonApplication rec {
    LC_ALL=C PYTHONPATH=src/:$PYTHONPATH pytest tests --ignore=src/gpodder/utilwin32ctypes.py --ignore=src/mygpoclient --cov=gpodder
  '';

+  makeWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}" ];
+
+  passthru.updateScript = gitUpdater {};
+
  meta = with lib; {
    description = "A podcatcher written in python";
    longDescription = ''
--- a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
@ -12,6 +12,8 @@ stdenv.mkDerivation rec {

  buildInputs = [ faust2jaqt faust2lv2 ];

+  dontWrapQtApps = true;
+
  buildPhase = ''
    faust2jaqt -vec -time -t 99999 CharacterCompressor.dsp
    faust2jaqt -vec -time -t 99999 CharacterCompressorMono.dsp
@ -21,8 +23,9 @@ stdenv.mkDerivation rec {

  installPhase = ''
    mkdir -p $out/bin
-    cp CharacterCompressor $out/bin/
-    cp CharacterCompressorMono $out/bin/
+    for f in $(find . -executable -type f); do
+      cp $f $out/bin/
+    done
    mkdir -p $out/lib/lv2
    cp -r CharacterCompressor.lv2/ $out/lib/lv2
    cp -r CharacterCompressorMono.lv2/ $out/lib/lv2
--- a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
@ -12,6 +12,8 @@ stdenv.mkDerivation rec {

  buildInputs = [ faust2jaqt faust2lv2 ];

+  dontWrapQtApps = true;
+
  buildPhase = ''
    for f in *.dsp;
    do
@ -28,8 +30,7 @@ stdenv.mkDerivation rec {
    mkdir -p $out/lib/lv2
    mv *.lv2/ $out/lib/lv2
    mkdir -p $out/bin
-    for f in $(find . -executable -type f);
-    do
+    for f in $(find . -executable -type f); do
      cp $f $out/bin/
    done
  '';
--- a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
@ -12,6 +12,8 @@ stdenv.mkDerivation rec {

  buildInputs = [ faust2jaqt faust2lv2 ];

+  dontWrapQtApps = true;
+
  buildPhase = ''
    faust2jaqt -time -vec -t 99999 ConstantDetuneChorus.dsp
    faust2lv2  -time -vec -t 99999 -gui ConstantDetuneChorus.dsp
@ -19,7 +21,9 @@ stdenv.mkDerivation rec {

  installPhase = ''
    mkdir -p $out/bin
-    cp ConstantDetuneChorus $out/bin/
+    for f in $(find . -executable -type f); do
+      cp $f $out/bin/
+    done
    mkdir -p $out/lib/lv2
    cp -r ConstantDetuneChorus.lv2/ $out/lib/lv2
  '';
@ -29,5 +33,7 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/magnetophon/constant-detune-chorus";
    license = lib.licenses.gpl3;
    maintainers = [ lib.maintainers.magnetophon ];
+    # ERROR3 : n is NaN in an Interval
+    broken = true;
  };
 }
--- a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
@ -12,6 +12,8 @@ stdenv.mkDerivation rec {

  buildInputs = [ faust2jaqt faust2lv2 ];

+  dontWrapQtApps = true;
+
  buildPhase = ''
    faust2jaqt -vec -time -t 99999 LazyLimiter.dsp
    faust2lv2 -vec -time -t 99999  -gui LazyLimiter.dsp
@ -19,7 +21,9 @@ stdenv.mkDerivation rec {

  installPhase = ''
    mkdir -p $out/bin
-    cp LazyLimiter $out/bin/
+    for f in $(find . -executable -type f); do
+      cp $f $out/bin/
+    done
    mkdir -p $out/lib/lv2
    cp -r LazyLimiter.lv2/ $out/lib/lv2
  '';
--- a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
@ -19,6 +19,8 @@ stdenv.mkDerivation rec {

  buildInputs = [ faust2jaqt faust2lv2 ];

+  dontWrapQtApps = true;
+
  buildPhase = ''
    faust2jaqt -time -vec -t 99999 MBdistortion.dsp
    faust2lv2 -time -vec -gui -t 99999 MBdistortion.dsp
@ -26,7 +28,9 @@ stdenv.mkDerivation rec {

  installPhase = ''
    mkdir -p $out/bin
-    cp MBdistortion $out/bin/
+    for f in $(find . -executable -type f); do
+      cp $f $out/bin/
+    done
    mkdir -p $out/lib/lv2
    cp -r MBdistortion.lv2/ $out/lib/lv2
  '';
--- a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
@ -12,6 +12,8 @@ stdenv.mkDerivation rec {

  buildInputs = [ faust2jaqt faust2lv2 ];

+  dontWrapQtApps = true;
+
  buildPhase = ''
    faust2jaqt -time -vec -t 99999 RhythmDelay.dsp
    faust2lv2  -time -vec -t 99999 -gui RhythmDelay.dsp
@ -19,7 +21,9 @@ stdenv.mkDerivation rec {

  installPhase = ''
    mkdir -p $out/bin
-    cp RhythmDelay $out/bin/
+    for f in $(find . -executable -type f); do
+      cp $f $out/bin/
+    done
    mkdir -p $out/lib/lv2
    cp -r RhythmDelay.lv2/ $out/lib/lv2
  '';
--- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
@ -18,6 +18,8 @@ stdenv.mkDerivation rec {

  runtimeInputs = [ pitchTracker ];

+  dontWrapQtApps = true;
+
  patchPhase = ''
    sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/synthWrapper
    sed -i "s@../PureData/OscSendVoc.pd@$out/PureData/OscSendVoc.pd@g" launchers/pitchTracker
@ -32,10 +34,8 @@ stdenv.mkDerivation rec {
  installPhase = ''
    mkdir -p $out/bin

-    for file in ./*; do
-      if test -x "$file" && test -f "$file"; then
-        cp "$file" "$out/bin"
-      fi
+    for f in $(find . -executable -type f); do
+      cp $f $out/bin/
    done

    cp launchers/* $out/bin/
--- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
@ -12,6 +12,8 @@ stdenv.mkDerivation rec {

  buildInputs = [ faust2jaqt faust2lv2 ];

+  dontWrapQtApps = true;
+
  buildPhase = ''
    echo "hack out autoComp.dsp due to https://github.com/grame-cncm/faust/407/issues "
    rm autoComp.dsp
@ -33,8 +35,7 @@ stdenv.mkDerivation rec {
    mv *.lv2/ $out/lib/lv2
    mkdir -p $out/bin
    rm newlib.sh
-    for f in $(find . -executable -type f);
-    do
+    for f in $(find . -executable -type f); do
      cp $f $out/bin/
    done
  '';
--- a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
@ -12,6 +12,8 @@ stdenv.mkDerivation rec {

  buildInputs = [ faust2jaqt faust2lv2 ];

+  dontWrapQtApps = true;
+
  buildPhase = ''
    for f in *.dsp
      do
@ -28,7 +30,9 @@ stdenv.mkDerivation rec {
    mkdir -p $out/lib/lv2
    mv *.lv2/ $out/lib/lv2
    mkdir -p $out/bin
-    cp * $out/bin/
+    for f in $(find . -executable -type f); do
+      cp $f $out/bin/
+    done
 '';

  meta = {
--- a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
@ -12,6 +12,8 @@ stdenv.mkDerivation rec {

  buildInputs = [ faust2jaqt faust2lv2 ];

+  dontWrapQtApps = true;
+
  buildPhase = ''
    faust2jaqt -vec -double -time -t 99999 shelfMultiBand.dsp
    faust2jaqt -vec -double -time -t 99999 shelfMultiBandMono.dsp
@ -21,8 +23,9 @@ stdenv.mkDerivation rec {

  installPhase = ''
    mkdir -p $out/bin
-    cp shelfMultiBand $out/bin/
-    cp shelfMultiBandMono $out/bin/
+    for f in $(find . -executable -type f); do
+      cp $f $out/bin/
+    done
    mkdir -p $out/lib/lv2
    cp -r shelfMultiBand.lv2/ $out/lib/lv2
    cp -r shelfMultiBandMono.lv2/ $out/lib/lv2
--- a/pkgs/applications/audio/mooSpace/default.nix
+++ b/pkgs/applications/audio/mooSpace/default.nix
@ -14,6 +14,8 @@ stdenv.mkDerivation rec {

  patchPhase = "mv ${pname}_faust.dsp ${pname}.dsp";

+  dontWrapQtApps = true;
+
  buildPhase = ''
    faust2jaqt -time -vec -t 0 ${pname}.dsp
    faust2lv2  -time -vec -t 0 -gui ${pname}.dsp
@ -21,7 +23,9 @@ stdenv.mkDerivation rec {

  installPhase = ''
    mkdir -p $out/bin
-    cp ${pname} $out/bin/
+    for f in $(find . -executable -type f); do
+      cp $f $out/bin/
+    done
    mkdir -p $out/lib/lv2
    cp -r ${pname}.lv2 $out/lib/lv2
  '';
--- a/pkgs/applications/audio/tambura/default.nix
+++ b/pkgs/applications/audio/tambura/default.nix
@ -12,6 +12,8 @@ stdenv.mkDerivation rec {

  buildInputs = [ faust2jaqt faust2lv2 ];

+  dontWrapQtApps = true;
+
  buildPhase = ''
    faust2jaqt -vec -time -t 99999 ${pname}.dsp
    faust2lv2 -vec -time -gui -t 99999 ${pname}.dsp
@ -19,7 +21,9 @@ stdenv.mkDerivation rec {

  installPhase = ''
    mkdir -p $out/bin
-    cp ${pname} $out/bin/
+    for f in $(find . -executable -type f); do
+      cp $f $out/bin/
+    done
    mkdir -p $out/lib/lv2
    cp -r ${pname}.lv2/ $out/lib/lv2
  '';
--- a/pkgs/applications/blockchains/lnd/default.nix
+++ b/pkgs/applications/blockchains/lnd/default.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "lnd";
-  version = "0.16.2-beta";
+  version = "0.16.3-beta";

  src = fetchFromGitHub {
    owner = "lightningnetwork";
    repo = "lnd";
    rev = "v${version}";
-    sha256 = "sha256-s0m/aS99uB6LZb0+73SQ++mF0Ukg6IYIL+jbEi8ezW0=";
+    hash = "sha256-/seSpWnlQmeU4vQtlHMOSedPXP9HJp1GyxcB1LqHayA=";
  };

-  vendorSha256 = "sha256-7Ydl56Z6aOMBQ1RamFzjD/yp3zgQLkF5WEoOQe1Urv0=";
+  vendorHash = "sha256-obrSVMqTwHe7231wa0OuoT6ANBqkQbkHIy93J2f68Zk=";

  subPackages = [ "cmd/lncli" "cmd/lnd" ];

--- a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix
@ -7,10 +7,12 @@
 , intltool
 , autoreconfHook
 , wrapGAppsHook
+, cinnamon
 , lightdm
 , gtk3
 , pixman
 , libcanberra
+, libgnomekbd
 , libX11
 , libXext
 , linkFarm
@ -20,13 +22,13 @@

 stdenv.mkDerivation rec {
  pname = "lightdm-slick-greeter";
-  version = "1.6.1";
+  version = "1.8.1";

  src = fetchFromGitHub {
    owner = "linuxmint";
    repo = "slick-greeter";
    rev = version;
-    sha256 = "sha256-k/E3bR63kesHQ/we+ctC0UEYE5YdZ6Lv5lYuXqCOvKA=";
+    sha256 = "sha256-40RyGWn32ppPjsuPljGBO6o7bu2rKYBweDycRS7xAVA=";
  };

  nativeBuildInputs = [
@ -40,10 +42,12 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
+    cinnamon.xapp
    lightdm
    gtk3
    pixman
    libcanberra
+    libgnomekbd # needed by XApp.KbdLayoutController
    libX11
    libXext
  ];
@ -62,6 +66,10 @@ stdenv.mkDerivation rec {
    substituteInPlace src/session-list.vala \
      --replace "/usr/share" "${placeholder "out"}/share"

+    # We prefer stable path here.
+    substituteInPlace data/x.dm.slick-greeter.gschema.xml \
+      --replace "/usr/share/onboard" "/run/current-system/sw/share/onboard"
+
    patchShebangs files/usr/bin/*
  '';

--- a/pkgs/applications/editors/emacs/generic.nix
+++ b/pkgs/applications/editors/emacs/generic.nix
@ -98,7 +98,7 @@
 , withWebP ? lib.versionAtLeast version "29"
 , withX ? !(stdenv.isDarwin || noGui || withPgtk)
 , withXinput2 ? withX && lib.versionAtLeast version "29"
-, withXwidgets ? !noGui && (withGTK3 || withPgtk)
+, withXwidgets ? !stdenv.isDarwin && !noGui && (withGTK3 || withPgtk)

 # Options
 , siteStart ? ./site-start.el
--- a/pkgs/applications/misc/dbx/default.nix
+++ b/pkgs/applications/misc/dbx/default.nix
@ -16,11 +16,18 @@ python3.pkgs.buildPythonApplication rec {
    hash = "sha256-dArR1z3wkGDd3Y1WHK0sLjhuaKHAcsx6cCH2rgVdUGs=";
  };

-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "mlflow-skinny>=1.28.0,<3.0.0" "mlflow" \
-      --replace "rich==12.6.0" "rich"
-  '';
+  pythonRelaxDeps = [
+    "rich"
+    "typer"
+  ];
+
+  pythonRemoveDeps = [
+    "mlflow-skinny"
+  ];
+
+  nativeBuildInputs = with python3.pkgs; [
+    pythonRelaxDepsHook
+  ];

  propagatedBuildInputs = with python3.pkgs; [
    aiohttp
--- a/pkgs/applications/misc/deadd-notification-center/default.nix
+++ b/pkgs/applications/misc/deadd-notification-center/default.nix
@ -17,13 +17,13 @@ let
  '';
 in mkDerivation rec {
  pname = "deadd-notification-center";
-  version = "unstable-2022-11-07";
+  version = "2.0.3";

  src = fetchFromGitHub {
    owner = "phuhl";
    repo = "linux_notification_center";
-    rev = "f4b8e2b724d86def9e7b0e12ea624f95760352d5";
-    hash = "sha256-ClJfWqStULvmj5YRAUDAmn2WOSA2sVtyZsa+qSY51Gk=";
+    rev = "${version}";
+    hash = "sha256-OM4zzKdo0HMvzAl7BG9IuSHmTauSC5rLWoJJOAshDYg=";
  };

  isLibrary = false;
@ -31,11 +31,11 @@ in mkDerivation rec {
  isExecutable = true;

  libraryHaskellDepends = with haskellPackages; [
-    base bytestring ConfigFile containers dbus directory env-locale
+    aeson base bytestring ConfigFile containers dbus directory env-locale
    filepath gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject
    gi-gtk gi-pango haskell-gettext haskell-gi haskell-gi-base
    hdaemonize here lens mtl process regex-tdfa setlocale split stm
-    tagsoup text time transformers tuple unix
+    tagsoup text time transformers tuple unix yaml
  ];

  executableHaskellDepends = with haskellPackages; [ base ];
--- a/pkgs/applications/misc/feedbackd/default.nix
+++ b/pkgs/applications/misc/feedbackd/default.nix
@ -31,7 +31,7 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "feedbackd";
-  version = "0.1.0";
+  version = "0.2.0";

  outputs = [ "out" "dev" "devdoc" ];

@ -40,17 +40,10 @@ stdenv.mkDerivation rec {
    owner = "Librem5";
    repo = "feedbackd";
    rev = "v${version}";
-    hash = "sha256-7H5Ah4zo+wLKd0WoKoOgtIm7HcUSw8PTf/KzBlY75oc=";
+    hash = "sha256-l5rfMx3ElW25A5WVqzfKBp57ebaNC9msqV7mvnwv10s=";
    fetchSubmodules = true;
  };

-  patches = [
-    (fetchpatch2 {
-      url = "https://source.puri.sm/Librem5/feedbackd/-/merge_requests/109.patch";
-      hash = "sha256-z3Ud6P2GHYOaGA2vJDD3Sz47+M8p0VcYZ5gbYcGydMk=";
-    })
-  ];
-
  depsBuildBuild = [
    pkg-config
  ];
--- a/pkgs/applications/misc/phoc/default.nix
+++ b/pkgs/applications/misc/phoc/default.nix
@ -52,7 +52,7 @@ let
  });
 in stdenv.mkDerivation rec {
  pname = "phoc";
-  version = "0.25.0";
+  version = "0.27.0";

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
@ -60,7 +60,7 @@ in stdenv.mkDerivation rec {
    owner = "Phosh";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-1cbv4vzQ+RcRoT1pOT8Q0nxuZzKUlec38KCNMYaceeE=";
+    sha256 = "sha256-4/Fxo72KXLy3gxXMS+PrTUbZl0EFt2GPMXg8+/fE7MY=";
    fetchSubmodules = true;
  };

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

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

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

-  cargoHash = "sha256-YSD7RXU3eBlELx76gU5eNOGkSoK9SRQZOV+7lil1fyQ=";
+  cargoHash = "sha256-eVJuebau0Y9oelniCzvOk9riMMZ9cS7E/G6KinbQa6k=";

  nativeBuildInputs = [
    installShellFiles
--- a/pkgs/applications/misc/shell-genie/default.nix
+++ b/pkgs/applications/misc/shell-genie/default.nix
@ -16,8 +16,13 @@ buildPythonPackage rec {
    hash = "sha256-z7LiAq2jLzqjg4Q/r9o7M6VbedeT34NyPpgctfqBp+8=";
  };

+  pythonRelaxDeps = [
+    "typer"
+  ];
+
  nativeBuildInputs = [
    poetry-core
+    pythonRelaxDepsHook
  ];

  propagatedBuildInputs = [
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@ -30,14 +30,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */
 }:

 mkDerivation rec {
-  version = "1.4.1";
+  version = "1.4.3";
  pname = "syncthingtray";

  src = fetchFromGitHub {
    owner = "Martchus";
    repo = "syncthingtray";
    rev = "v${version}";
-    sha256 = "sha256-6s78vytYxU7FWGQRO56qgmtZBlHbXMz3iVAbBXycDmI=";
+    sha256 = "sha256-6J/P/DDD17QtXAISQn77EDIYqQu1hY7EnIX0FC6H/20=";
  };

  buildInputs = [
--- a/pkgs/applications/misc/valent/default.nix
+++ b/pkgs/applications/misc/valent/default.nix
@ -22,14 +22,14 @@

 stdenv.mkDerivation rec {
  pname = "valent";
-  version = "unstable-2023-05-01";
+  version = "unstable-2023-06-11";

  src = fetchFromGitHub {
    owner = "andyholmes";
    repo = "valent";
-    rev = "74f5d9349a60f0d9fcf88cda01713980a221d639";
+    rev = "e6a121efa7eb7b432517d610de4deea6dfa876b0";
    fetchSubmodules = true;
-    sha256 = "sha256-wqdujEKizrDFXtsjSTWpFgDL7MH3tsLTc7yd3LFgIQU=";
+    hash = "sha256-8X4Yu8VY5ehptJN1KtsCuoECtEZNLZMzOvU91j8UmDk=";
  };

  nativeBuildInputs = [
--- 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-hu4+FAqub+dah9is4iCyy784L8kIiFqkyrcZzll8LoU=",
+    "hash": "sha256-+0La1Gx8uBnz5WEidTfW5yqyNT2Ii+UaJJxWh05VAks=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/aws",
    "owner": "hashicorp",
    "repo": "terraform-provider-aws",
-    "rev": "v5.2.0",
+    "rev": "v5.3.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-y4JNZ4cMqXwvRNys+llQNGw91EuU/dzGY6Ifs/0cX8c="
+    "vendorHash": "sha256-stvcLz/5DosG+c9syv5i2diTp8cCnCMfW1vngsXl7fQ="
  },
  "azuread": {
    "hash": "sha256-wBNS2a6O1QJgssbAWhSRSfxaVZ35zgT/qNdpE++NQ8U=",
@ -128,11 +128,11 @@
    "vendorHash": null
  },
  "azurerm": {
-    "hash": "sha256-OEybd46MRwtxnE11oy6KKg9uEqkzzUxrrMwbF0RkjUg=",
+    "hash": "sha256-YrAEwWHlxh8e0uH9UEy7F5wZkOzbqXUfy2g2uVwBrxA=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
    "owner": "hashicorp",
    "repo": "terraform-provider-azurerm",
-    "rev": "v3.60.0",
+    "rev": "v3.61.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@ -381,11 +381,11 @@
    "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg="
  },
  "fastly": {
-    "hash": "sha256-zjeiA09kTc9qE+YGGrmMhken7oh3pX309t6VKE/fKN0=",
+    "hash": "sha256-ZskfmyYqUFa848uAl+ejBUaYiD0dWdwUyWBw5TKRrHg=",
    "homepage": "https://registry.terraform.io/providers/fastly/fastly",
    "owner": "fastly",
    "repo": "terraform-provider-fastly",
-    "rev": "v5.0.0",
+    "rev": "v5.1.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@ -484,13 +484,13 @@
    "vendorHash": null
  },
  "hcloud": {
-    "hash": "sha256-aqx6oMIqMUgpVMInZPxGFPT9i+pBdU3ufjM6YUSiOss=",
+    "hash": "sha256-PAsXAZMCo4mXLLh2h40xN9SuTnCnScwdjAT2j5HvNrI=",
    "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
    "owner": "hetznercloud",
    "repo": "terraform-provider-hcloud",
-    "rev": "v1.39.0",
+    "rev": "v1.40.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-qa6DUmzL+JB/WTJM+a5VDvBCsrbt8gq/LeqzdAHLm0Q="
+    "vendorHash": "sha256-dORrQ0gmSLOfyPOuFE84h9OkFI9yslRBfYhwnZM3iQc="
  },
  "helm": {
    "hash": "sha256-mGrQ5YKNsv1+Vkan5ohMXnTYofhCQPuTFjemXF/g+tA=",
@ -539,11 +539,11 @@
    "vendorHash": "sha256-73Hpp4OLJyFmbiczVmFzCi++W0te6G9LSb8LhNwSDUg="
  },
  "huaweicloud": {
-    "hash": "sha256-2N8BmYd/8Mf65ARYeQcbMKLjNlxP6uZe+3+lsNZbiZg=",
+    "hash": "sha256-ullp0qBo2BFokbXMek5Y5s7qN2Ig3L5ekXSlbLhvrWU=",
    "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
    "owner": "huaweicloud",
    "repo": "terraform-provider-huaweicloud",
-    "rev": "v1.49.0",
+    "rev": "v1.50.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@ -1026,11 +1026,11 @@
    "vendorHash": null
  },
  "snowflake": {
-    "hash": "sha256-1a2zGEZgMdmH6/dBJ+19VHDMfOs7Xwd4wJ/CA/mVI3g=",
+    "hash": "sha256-0TnsoK1B6npf4zkaG2hkE8WVXgrI7DsFZFuqFd8kz/4=",
    "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake",
    "owner": "Snowflake-Labs",
    "repo": "terraform-provider-snowflake",
-    "rev": "v0.66.1",
+    "rev": "v0.66.2",
    "spdx": "MIT",
    "vendorHash": "sha256-ZNkZ2GMSBZHz+L626VqT7pTeb8fSYkaCi84O5ggd1FM="
  },
--- a/pkgs/applications/networking/feedreaders/feed2imap-go/default.nix
+++ b/pkgs/applications/networking/feedreaders/feed2imap-go/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "feed2imap-go";
-  version = "1.6.0";
+  version = "1.7.0";

  src = fetchFromGitHub {
    owner = "Necoro";
    repo = "feed2imap-go";
    rev = "v${version}";
-    sha256 = "sha256-zRp/MfRtCgzYFNKoV4IWbORfCy7vaaDgmRvNQ0cICNQ=";
+    sha256 = "sha256-Qtpg8DvIFkba+Do8IwemBF0rt85wS4Tq7yOLsdpQFCs=";
  };

-  vendorHash = "sha256-py0totvLLw3kahEtdZkES1t7tZsKBAUS6IMTcn847kE=";
+  vendorHash = "sha256-WFbfSzU1N2RAOMfCM7wqiAQ6R1HRaT0EfX4KYhstHJU=";

  # The print-cache tool is not an end-user tool (https://github.com/Necoro/feed2imap-go/issues/94)
  postInstall = ''
--- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix
@ -1,12 +1,13 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , pkg-config
 , cmake
 , ninja
 , yasm
 , libjpeg
-, openssl_1_1
+, openssl
 , libopus
 , ffmpeg_4
 , protobuf
@ -44,6 +45,17 @@
 , ApplicationServices
 }:

+let
+  libsrtp = fetchFromGitHub {
+    owner = "cisco";
+    repo = "libsrtp";
+
+    # https://github.com/desktop-app/tg_owt/commit/6894e86eef8809d42b66eb85e376006f2a816a56
+    rev = "a566a9cfcd619e8327784aa7cff4a1276dc1e895";
+    sha256 = "sha256-OvCw7oF1OuamP3qO2BsimeBSHq1rcXFLfK8KnbbgkMU=";
+  };
+in
+
 stdenv.mkDerivation {
  pname = "tg_owt";
  version = "unstable-2022-04-13";
@ -58,6 +70,16 @@ stdenv.mkDerivation {

  patches = [
    ./tg_owt.patch
+
+    (fetchpatch {
+      url = "https://github.com/desktop-app/tg_owt/commit/0614aac699b1a53242ffe2664e3724533bf64f97.patch";
+      hash = "sha256-iCdX518CB/RboDFhl3opnwcAgtqpNWZzYtV75Q+WB6Y=";
+    })
+
+    (fetchpatch {
+      url = "https://github.com/desktop-app/tg_owt/commit/9d120195334db4f232c925529aa7601656dc59d7.patch";
+      hash = "sha256-k99OBCdE2eQVyXEyvreEqVtzC8Xfdolbgd1Z7lV2ceE=";
+    })
  ];

  postPatch = lib.optionalString stdenv.isLinux ''
@ -66,6 +88,9 @@ stdenv.mkDerivation {
      --replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"' \
      --replace '"libgbm.so.1"' '"${mesa}/lib/libgbm.so.1"' \
      --replace '"libdrm.so.2"' '"${libdrm}/lib/libdrm.so.2"'
+
+    rm -r src/third_party/libsrtp
+    cp -r --no-preserve=mode ${libsrtp} src/third_party/libsrtp
  '';

  outputs = [ "out" "dev" ];
@ -74,7 +99,7 @@ stdenv.mkDerivation {

  propagatedBuildInputs = [
    libjpeg
-    openssl_1_1
+    openssl
    libopus
    ffmpeg_4
    protobuf
--- a/pkgs/applications/networking/insync/default.nix
+++ b/pkgs/applications/networking/insync/default.nix
@ -10,6 +10,7 @@
 , libdrm
 , libGL
 , wayland
+, xkeyboard_config
 , libthai
 }:

@ -88,18 +89,16 @@ let
    # for including insync's xdg data dirs
    extraOutputsToInstall = [ "share" ];

-    targetPkgs = pkgs: [
+    targetPkgs = pkgs: with pkgs; [
      insync-pkg
-    ];
-
-    multiPkgs = pkgs: with pkgs; [
-      # apparently only package needed for the FHS :)
      libudev0-shim
    ];

    runScript = writeShellScript "insync-wrapper.sh" ''
    # QT_STYLE_OVERRIDE was used to suppress a QT warning, it should have no actual effect for this binary.
    export QT_STYLE_OVERRIDE=Fusion
+    # xkb configuration needed: https://github.com/NixOS/nixpkgs/issues/236365
+    export XKB_CONFIG_ROOT=${xkeyboard_config}/share/X11/xkb/
    exec "${insync-pkg.outPath}/lib/insync/insync" "$@"
    '';

--- a/pkgs/applications/networking/misc/zammad/default.nix
+++ b/pkgs/applications/networking/misc/zammad/default.nix
@ -28,7 +28,10 @@ let

    src = fetchFromGitHub (lib.importJSON ./source.json);

-    patches = [ ./0001-nulldb.patch ];
+    patches = [
+      ./0001-nulldb.patch
+      ./fix-sendmail-location.diff
+    ];

    postPatch = ''
      sed -i -e "s|ruby '3.1.[0-9]\+'|ruby '${ruby.version}'|" Gemfile
--- a/pkgs/applications/networking/misc/zammad/fix-sendmail-location.diff
+++ b/pkgs/applications/networking/misc/zammad/fix-sendmail-location.diff
@ -0,0 +1,12 @@
+diff --git a/app/models/channel/driver/sendmail.rb b/app/models/channel/driver/sendmail.rb
+index b15ef48a6..64c120a87 100644
+--- a/app/models/channel/driver/sendmail.rb
+++ b/app/models/channel/driver/sendmail.rb
+@@ -32,6 +32,6 @@ def delivery_method(mail)
+ 
+     return mail.delivery_method :test if Rails.env.test?
+ 
+-    mail.delivery_method :sendmail
+    mail.delivery_method :sendmail, :location => '/run/wrappers/bin/sendmail'
+   end
+ end
--- a/pkgs/applications/video/natron/config.pri
+++ b/pkgs/applications/video/natron/config.pri
@ -1,20 +0,0 @@
-boost: LIBS += -lboost_serialization
-expat: LIBS += -lexpat
-expat: PKGCONFIG -= expat
-cairo {
-        PKGCONFIG += cairo
-        LIBS -=  $$system(pkg-config --variable=libdir cairo)/libcairo.a
-}
-pyside {
-        PKGCONFIG -= pyside
-        INCLUDEPATH += $$system(pkg-config --variable=includedir pyside)
-        INCLUDEPATH += $$system(pkg-config --variable=includedir pyside)/QtCore
-        INCLUDEPATH += $$system(pkg-config --variable=includedir pyside)/QtGui
-        INCLUDEPATH += $$system(pkg-config --variable=includedir QtGui)
-        LIBS += -lpyside-python2.7
-}
-shiboken {
-        PKGCONFIG -= shiboken
-        INCLUDEPATH += $$system(pkg-config --variable=includedir shiboken)
-        LIBS += -lshiboken-python2.7
-}
--- a/pkgs/applications/video/natron/default.nix
+++ b/pkgs/applications/video/natron/default.nix
@ -1,96 +1,29 @@
-{ lib, stdenv, fetchurl, qt4, pkg-config, boost, expat, cairo, python2Packages,
-  cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip,
-  poppler, imagemagick, openexr, ffmpeg, opencolorio_1, openimageio_1,
-  qmake4Hook, libpng, libGL, lndir, libraw, openjpeg, libwebp, fetchFromGitHub }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, wrapQtAppsHook
+, boost
+, cairo
+, ceres-solver
+, expat
+, extra-cmake-modules
+, glog
+, libXdmcp
+, python3
+, wayland
+}:

 let
-  minorVersion = "2.3";
-  version = "${minorVersion}.15";
-  OpenColorIO-Configs = fetchurl {
-    url = "https://github.com/NatronGitHub/OpenColorIO-Configs/archive/Natron-v${minorVersion}.tar.gz";
-    sha256 = "AZK9J+RnMyxOYcAQOAQZj5QciPQ999m6jrtBt5rdpkA=";
+  minorVersion = "2.5";
+  version = "${minorVersion}.0";
+  OpenColorIO-Configs = fetchFromGitHub {
+    owner = "NatronGitHub";
+    repo = "OpenColorIO-Configs";
+    rev = "Natron-v${minorVersion}";
+    hash = "sha256-TD7Uge9kKbFxOmOCn+TSQovnKTmFS3uERTu5lmZFHbc=";
  };
-  seexpr = stdenv.mkDerivation rec {
-    version = "1.0.1";
-    pname = "seexpr";
-    src = fetchurl {
-      url = "https://github.com/wdas/SeExpr/archive/rel-${version}.tar.gz";
-      sha256 = "1ackh0xs4ip7mk34bam8zd4qdymkdk0dgv8x0f2mf6gbyzzyh7lp";
-    };
-    nativeBuildInputs = [ cmake ];
-    buildInputs = [ libpng flex bison ];
-  };
-  buildPlugin = { pluginName, sha256, nativeBuildInputs ? [], buildInputs ? [], preConfigure ? "", postPatch ? "" }:
-    stdenv.mkDerivation {
-      pname = "openfx-${pluginName}";
-      version = version;
-      src = fetchurl {
-        url = "https://github.com/NatronGitHub/openfx-${pluginName}/releases/download/Natron-${version}/openfx-${pluginName}-Natron-${version}.tar.xz";
-        inherit sha256;
-      };
-      inherit nativeBuildInputs buildInputs postPatch;
-      preConfigure = ''
-        makeFlagsArray+=("CONFIG=release")
-        makeFlagsArray+=("PLUGINPATH=$out/Plugins/OFX/Natron")
-        ${preConfigure}
-      '';
-    };
-  lodepngcpp = fetchurl {
-    url = "https://raw.githubusercontent.com/lvandeve/lodepng/a70c086077c0eaecbae3845e4da4424de5f43361/lodepng.cpp";
-    sha256 = "1dxkkr4jbmvlwfr7m16i1mgcj1pqxg9s1a7y3aavs9rrk0ki8ys2";
-  };
-  lodepngh = fetchurl {
-    url = "https://raw.githubusercontent.com/lvandeve/lodepng/a70c086077c0eaecbae3845e4da4424de5f43361/lodepng.h";
-    sha256 = "14drdikd0vws3wwpyqq7zzm5z3kg98svv4q4w0hr45q6zh6hs0bq";
-  };
-  cimgversion = "89b9d062ec472df3d33989e6d5d2a8b50ba0775c";
-  CImgh = fetchurl {
-    url = "https://raw.githubusercontent.com/dtschump/CImg/${cimgversion}/CImg.h";
-    sha256 = "sha256-NbYpZDNj2oZ+wqoEkRwwCjiujdr+iGOLA0Pa0Ynso6U=";
-  };
-  inpainth = fetchurl {
-    url = "https://raw.githubusercontent.com/dtschump/CImg/${cimgversion}/plugins/inpaint.h";
-    sha256 = "sha256-cd28a3VOs5002GkthHkbIUrxZfKuGhqIYO4Oxe/2HIQ=";
-  };
-  plugins = map buildPlugin [
-    ({
-      pluginName = "arena";
-      sha256 = "tUb6myG03mRieUAfgRZfv5Ap+cLvbpNrLMYCGTiAq8c=";
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        pango librsvg librevenge libcdr opencolorio_1 libxml2 libzip
-        poppler imagemagick
-      ];
-      preConfigure = ''
-        sed -i 's|pkg-config poppler-glib|pkg-config poppler poppler-glib|g' Makefile.master
-        for i in Extra Bundle; do
-          cp ${lodepngcpp} $i/lodepng.cpp
-          cp ${lodepngh} $i/lodepng.h
-        done
-      '';
-    })
-    ({
-      pluginName = "io";
-      sha256 = "OQg6a5wNy9TFFySjmgd1subvXRxY/ZnSOCkaoUo+ZaA=";
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libpng ffmpeg openexr opencolorio_1 openimageio_1 boost libGL
-        seexpr libraw openjpeg libwebp
-      ];
-    })
-    ({
-      pluginName = "misc";
-      sha256 = "XkdQyWI9ilF6IoP3yuHulNUZRPLX1m4lq/+RbXsrFEQ=";
-      buildInputs = [
-        libGL
-      ];
-      postPatch = ''
-        cp '${inpainth}' CImg/Inpaint/inpaint.h
-        patch -p0 -dCImg < CImg/Inpaint/inpaint.h.patch # taken from the Makefile; it gets skipped if the file already exists
-        cp '${CImgh}' CImg/CImg.h
-      '';
-    })
-  ];
 in
 stdenv.mkDerivation {
  inherit version;
@ -101,28 +34,40 @@ stdenv.mkDerivation {
    repo = "Natron";
    rev = "v${version}";
    fetchSubmodules = true;
-    sha256 = "sha256-KuXJmmIsvwl4uqmAxXqWU+273jsdWrCuUSwWn5vuu8M=";
+    hash = "sha256-dgScbfyulZPlrngqSw7xwipldoRd8uFO8VP9mlJyhQ8=";
  };

-  nativeBuildInputs = [ qmake4Hook pkg-config python2Packages.wrapPython ];
+  cmakeFlags = [ "-DNATRON_SYSTEM_LIBS=ON" ];

-  buildInputs = [
-    qt4 boost expat cairo python2Packages.pyside python2Packages.pysideShiboken
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wrapQtAppsHook
  ];

-  preConfigure = ''
-    export MAKEFLAGS=-j$NIX_BUILD_CORES
-    cp ${./config.pri} config.pri
-    mkdir OpenColorIO-Configs
-    tar -xf ${OpenColorIO-Configs} --strip-components=1 -C OpenColorIO-Configs
+  buildInputs = [
+    boost
+    expat
+    cairo
+    python3
+    python3.pkgs.pyside2
+    python3.pkgs.shiboken2
+    extra-cmake-modules
+    wayland
+    glog
+    ceres-solver
+    libXdmcp
+  ];
+
+  postInstall = ''
+    mkdir -p $out/share
+    cp -r ${OpenColorIO-Configs} $out/share/OpenColorIO-Configs
  '';

  postFixup = ''
-    for i in ${lib.escapeShellArgs plugins}; do
-      ${lndir}/bin/lndir $i $out
-    done
    wrapProgram $out/bin/Natron \
-      --set PYTHONPATH "$PYTHONPATH"
+      --prefix PYTHONPATH : "${python3.pkgs.makePythonPath [ python3.pkgs.qtpy python3.pkgs.pyside2 ]}" \
+      --set-default OCIO "$out/share/OpenColorIO-Configs/blender/config.ocio"
  '';

  meta = with lib; {
@ -135,6 +80,6 @@ stdenv.mkDerivation {
    license = lib.licenses.gpl2;
    maintainers = [ maintainers.puffnfresh ];
    platforms = platforms.linux;
-    broken = true; # Last evaluated on Hydra on 2021-05-18
+    broken = stdenv.isLinux && stdenv.isAarch64;
  };
 }
--- a/pkgs/applications/window-managers/phosh/default.nix
+++ b/pkgs/applications/window-managers/phosh/default.nix
@ -36,7 +36,7 @@

 stdenv.mkDerivation rec {
  pname = "phosh";
-  version = "0.25.1";
+  version = "0.27.0";

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
    repo = pname;
    rev = "v${version}";
    fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects
-    sha256 = "sha256-ysAZdmkFEuqJDTPe246F2I4Qp+fjtomia42PS8BuMM8=";
+    sha256 = "sha256-dnSYeXn3aPwvxeIjjk+PsnOVKyuGlxXMXGWDdrRrIM0=";
  };

  nativeBuildInputs = [
--- a/pkgs/data/misc/clash-geoip/default.nix
+++ b/pkgs/data/misc/clash-geoip/default.nix
@ -2,11 +2,11 @@

 stdenvNoCC.mkDerivation rec {
  pname = "clash-geoip";
-  version = "20230512";
+  version = "20230612";

  src = fetchurl {
    url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb";
-    sha256 = "sha256-/QIii+f7pOzXXlhDQV6XGHpyjAlCS/OONalbPSnmArE=";
+    sha256 = "sha256-uD+UzMjpQvuNMcIxm4iHLnJwhxXstE3W+0xCuf9j/i8=";
  };

  dontUnpack = true;
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@ -283,6 +283,7 @@ in package-set { inherit pkgs lib callPackage; } self // {
    # ghcWithPackages :: (HaskellPkgSet -> [ HaskellPkg ]) -> Derivation
    ghcWithPackages = buildHaskellPackages.callPackage ./with-packages-wrapper.nix {
      haskellPackages = self;
+      inherit (self) hoogleWithPackages;
    };


--- a/pkgs/development/interpreters/kamilalisp/default.nix
+++ b/pkgs/development/interpreters/kamilalisp/default.nix
@ -0,0 +1,38 @@
+{ lib
+, stdenv
+, fetchurl
+, jre
+, makeWrapper
+}:
+
+stdenv.mkDerivation rec {
+  name = "kamilalisp";
+  version = "0.2";
+
+  src = fetchurl {
+    url = "https://github.com/kspalaiologos/kamilalisp/releases/download/v${version}o/kamilalisp-${version}.jar";
+    hash = "sha256-NkRkLcJpar9iHEI+OmgpkYwkwVvU1J7izeBdytwIsdU=";
+  };
+
+  dontUnpack = true;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -pv $out/share/java $out/bin
+    cp ${src} $out/share/java/${name}-${version}.jar
+    makeWrapper ${jre}/bin/java $out/bin/kamilalisp \
+      --add-flags "-jar $out/share/java/${name}-${version}.jar" \
+      --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=on' \
+      --set _JAVA_AWT_WM_NONREPARENTING 1
+  '';
+
+  meta = {
+    homepage = "https://github.com/kspalaiologos/kamilalisp";
+    description = "A functional, flexible, and concise Lisp";
+    license = lib.licenses.gpl3Plus;
+    inherit (jre.meta) platforms;
+    maintainers = with lib.maintainers; [ cafkafk ];
+    sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
+  };
+}
--- a/pkgs/development/libraries/gvm-libs/default.nix
+++ b/pkgs/development/libraries/gvm-libs/default.nix
@ -23,13 +23,13 @@

 stdenv.mkDerivation rec {
  pname = "gvm-libs";
-  version = "22.5.0";
+  version = "22.6.2";

  src = fetchFromGitHub {
    owner = "greenbone";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-QHAkPZoLQG+UQ1YNdad+XYOywqLqIW1vBmcFkuf3pXU=";
+    hash = "sha256-b7a9LD291LT28TujOQ3DE76+wtmBYeAGrXZXTM0quWw=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/nim-packages/build-nim-package/default.nix
+++ b/pkgs/development/nim-packages/build-nim-package/default.nix
@ -1,45 +1,44 @@
 { lib, stdenv, nim, nim_builder }:
+pkgArgs:

-{ strictDeps ? true, depsBuildBuild ? [ ], nativeBuildInputs ? [ ]
-, configurePhase ? null, buildPhase ? null, checkPhase ? null
-, installPhase ? null, enableParallelBuilding ? true, meta ? { }, ... }@attrs:
-
-stdenv.mkDerivation (attrs // {
-  inherit strictDeps enableParallelBuilding;
-  depsBuildBuild = [ nim_builder ] ++ depsBuildBuild;
-  nativeBuildInputs = [ nim ] ++ nativeBuildInputs;
-
-  configurePhase = if (configurePhase == null) then ''
+let
+  baseAttrs = {
+    strictDeps = true;
+    enableParallelBuilding = true;
+    configurePhase = ''
      runHook preConfigure
      export NIX_NIM_BUILD_INPUTS=''${pkgsHostTarget[@]} $NIX_NIM_BUILD_INPUTS
      nim_builder --phase:configure
      runHook postConfigure
-  '' else
-    configurePhase;
-
-  buildPhase = if (buildPhase == null) then ''
+    '';
+    buildPhase = ''
      runHook preBuild
      nim_builder --phase:build
      runHook postBuild
-  '' else
-    buildPhase;
-
-  checkPhase = if (checkPhase == null) then ''
+    '';
+    checkPhase = ''
      runHook preCheck
      nim_builder --phase:check
      runHook postCheck
-  '' else
-    checkPhase;
-
-  installPhase = if (installPhase == null) then ''
+    '';
+    installPhase = ''
      runHook preInstall
      nim_builder --phase:install
      runHook postInstall
-  '' else
-    installPhase;
-
-  meta = meta // {
-    platforms = meta.platforms or nim.meta.platforms;
-    maintainers = (meta.maintainers or [ ]) ++ [ lib.maintainers.ehmry ];
+    '';
+    meta = { inherit (nim.meta) maintainers platforms; };
  };
-})
+
+  inputsOverride =
+    { depsBuildBuild ? [ ], nativeBuildInputs ? [ ], meta, ... }: {
+      depsBuildBuild = [ nim_builder ] ++ depsBuildBuild;
+      nativeBuildInputs = [ nim ] ++ nativeBuildInputs;
+    };
+
+  composition = finalAttrs:
+    let
+      asFunc = x: if builtins.isFunction x then x else (_: x);
+      prev = baseAttrs // (asFunc ((asFunc pkgArgs) finalAttrs)) baseAttrs;
+    in prev // inputsOverride prev;
+
+in stdenv.mkDerivation composition
--- a/pkgs/development/nim-packages/sdl2/default.nix
+++ b/pkgs/development/nim-packages/sdl2/default.nix
@ -1,10 +1,10 @@
 { lib, buildNimPackage, fetchNimble, SDL2 }:

-buildNimPackage rec {
+buildNimPackage (finalAttrs: {
  pname = "sdl2";
  version = "2.0.4";
  src = fetchNimble {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
    hash = "sha256-Vtcj8goI4zZPQs2TbFoBFlcR5UqDtOldaXSH/+/xULk=";
  };
  propagatedBuildInputs = [ SDL2 ];
@ -14,4 +14,4 @@ buildNimPackage rec {
    platforms = lib.platforms.linux; # Problems with Darwin.
    license = [ lib.licenses.mit ];
  };
-}
+})
--- a/pkgs/development/python-modules/apispec-webframeworks/default.nix
+++ b/pkgs/development/python-modules/apispec-webframeworks/default.nix
@ -0,0 +1,50 @@
+{ lib
+, apispec
+, bottle
+, buildPythonPackage
+, fetchFromGitHub
+, flask
+, mock
+, pytestCheckHook
+, pythonOlder
+, tornado
+}:
+
+buildPythonPackage rec {
+  pname = "apispec-webframeworks";
+  version = "0.5.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "marshmallow-code";
+    repo = "apispec-webframeworks";
+    rev = version;
+    hash = "sha256-ByNmmBLO99njw9JrT+cCW/K4NJBH92smAiIgg47Cvkk=";
+  };
+
+  propagatedBuildInputs = [
+    apispec
+  ] ++ apispec.optional-dependencies.yaml;
+
+  nativeCheckInputs = [
+    bottle
+    flask
+    mock
+    pytestCheckHook
+    tornado
+  ];
+
+  pythonImportsCheck = [
+    "apispec_webframeworks"
+  ];
+
+  meta = with lib; {
+    description = "Web framework plugins for apispec";
+    homepage = "https://github.com/marshmallow-code/apispec-webframeworks";
+    changelog = "https://github.com/marshmallow-code/apispec-webframeworks/blob/${version}/CHANGELOG.rst";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix
+++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
@ -5,10 +5,11 @@
 , orjson
 , pandas
 , poetry-core
-, pytestCheckHook
 , pytest-mock
-, pythonOlder
+, pytestCheckHook
 , python-dateutil
+, pythonOlder
+, pythonRelaxDepsHook
 , requests
 , typer
 , websocket-client
@ -16,7 +17,7 @@

 buildPythonPackage rec {
  pname = "coinmetrics-api-client";
-  version = "2023.5.26.17";
+  version = "2023.6.8.20";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -26,11 +27,16 @@ buildPythonPackage rec {
  src = fetchPypi {
    inherit version;
    pname = "coinmetrics_api_client";
-    hash = "sha256-GCHXraeH6WWTlCnw9B1Xwtb6jwcxcvW1siy2T/8x14Q=";
+    hash = "sha256-Koll0pod0vSW/F3veGTn8JYOMQI61REUW6Eh+TDJKNI=";
  };

+  pythonRelaxDeps = [
+    "typer"
+  ];
+
  nativeBuildInputs = [
    poetry-core
+    pythonRelaxDepsHook
  ];

  propagatedBuildInputs = [
@ -52,7 +58,9 @@ buildPythonPackage rec {

  passthru = {
    optional-dependencies = {
-      pandas = [ pandas ];
+      pandas = [
+        pandas
+      ];
    };
    updateScript = nix-update-script { };
  };
--- 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.10.1";
+  version = "2.10.2";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@ -30,7 +30,7 @@ buildPythonPackage rec {
    owner = "plotly";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-f/+GKbuijSE4LXhC7uPuLwJRk9xmChhanPIe2jagzEg=";
+    hash = "sha256-OcY4nEtIfR9nvBaBwpHeUJkHXwWZp+LZxjhEkwjRC9k=";
  };

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

 buildPythonPackage rec {
  pname = "datashader";
-  version = "0.14.4";
+  version = "0.15.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-AkHmEflRvjJFlycI5adpuxg6+/zu7Dzy7vbYCvd1b70=";
+    hash = "sha256-gbBIGnVTDnE8+s9CHaXgYspXkYMkZph/cLWXJMwDhy8=";
  };

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

 buildPythonPackage rec {
  pname = "deepl";
-  version = "1.14.0";
+  version = "1.15.0";
  format = "pyproject";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-jUHxyx+b1OICJHAs8lh5NVtl+MExyEYM/yfs2qz6fv4=";
+    hash = "sha256-BRFC4R5d1gxHyEJI41Fi0Az8GqmDG7mQ6Fx/o23OGcE=";
  };

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

 buildPythonPackage rec {
  pname = "dvc-data";
-  version = "0.55.0";
+  version = "1.7.0";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "iterative";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-eE1cVzhwyClVYmaotw37sG46g5W1ToUE/f3pZ2CCcE0=";
+    hash = "sha256-vZPhlCY7KWM521C/uFx8nddpLD/72tX0g1JRb2KeIfA=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
--- a/pkgs/development/python-modules/edk2-pytool-library/default.nix
+++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix
@ -11,14 +11,14 @@

 buildPythonPackage rec {
  pname = "edk2-pytool-library";
-  version = "0.15.2";
+  version = "0.15.3";
  format = "pyproject";

  src = fetchFromGitHub {
    owner = "tianocore";
    repo = "edk2-pytool-library";
    rev = "v${version}";
-    hash = "sha256-gadFpFDHfiZ0vbUIEODu4SUL5SSsukdThxqP2ik5adI=";
+    hash = "sha256-PWjevYUts0dQMBmABpU8neuTqDlglTCCQmuvnVndfto=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/elkm1-lib/default.nix
+++ b/pkgs/development/python-modules/elkm1-lib/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "elkm1-lib";
-  version = "2.2.4";
+  version = "2.2.5";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "gwww";
    repo = "elkm1";
    rev = "refs/tags/${version}";
-    hash = "sha256-qqkKsVSspVBVxX96vlM8+6SqfdIBTcVyODJzQ4Ga+6g=";
+    hash = "sha256-8Mzxaww6a+vi3i8H4W9jRgY+5mpTGaJbNBXPDPn8sl4=";
  };

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

 buildPythonPackage rec {
  pname = "fakeredis";
-  version = "2.12.1";
+  version = "2.14.1";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
    owner = "dsoftwareinc";
    repo = "fakeredis-py";
    rev = "refs/tags/v${version}";
-    hash = "sha256-WF3dITWCrTQDORfaGWPpJBQFkPrUN6faHohjvBuOW7I=";
+    hash = "sha256-kLCCCUbre/Bi0DFv/+PVHvw1NXn2HhQx5kYtEaOqP58=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/filedepot/default.nix
+++ b/pkgs/development/python-modules/filedepot/default.nix
@ -0,0 +1,64 @@
+{ lib
+, anyascii
+, buildPythonPackage
+, fetchFromGitHub
+, flaky
+, mock
+, paste
+, pillow
+, pymongo
+, pytestCheckHook
+, pythonOlder
+, requests
+, sqlalchemy
+}:
+
+buildPythonPackage rec {
+  pname = "filedepot";
+  version = "0.9.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "amol-";
+    repo = "depot";
+    rev = "refs/tags/${version}";
+    hash = "sha256-OJc4Qwar3sKhKKF1WldwaueRG7FCboWT2wXYldHJbPU=";
+  };
+
+  propagatedBuildInputs = [
+    anyascii
+  ];
+
+  nativeCheckInputs = [
+    flaky
+    mock
+    paste
+    pillow
+    pymongo
+    pytestCheckHook
+    requests
+    sqlalchemy
+  ];
+
+  disabledTestPaths = [
+    # The examples have tests
+    "examples"
+    # Missing dependencies (TurboGears2 and ming)
+    "tests/test_fields_ming.py"
+    "tests/test_wsgi_middleware.py"
+  ];
+
+  pythonImportsCheck = [
+    "depot"
+  ];
+
+  meta = with lib; {
+    description = "Toolkit for storing files and attachments in web applications";
+    homepage = "https://github.com/amol-/depot";
+    changelog = "https://github.com/amol-/depot/releases/tag/${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/ocrmypdf/default.nix
+++ b/pkgs/development/python-modules/ocrmypdf/default.nix
@ -30,7 +30,7 @@

 buildPythonPackage rec {
  pname = "ocrmypdf";
-  version = "14.2.0";
+  version = "14.2.1";

  disabled = pythonOlder "3.8";

@ -46,7 +46,7 @@ buildPythonPackage rec {
    postFetch = ''
      rm "$out/.git_archival.txt"
    '';
-    hash = "sha256-vbNYCnC71l+8omttCGK7+4i3WBiAyb9C5pfApm+SsC0=";
+    hash = "sha256-i09FPyplYhBqgHWWSXZrvI+7f31yzc5KvgAqVJ3WtWU=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
--- a/pkgs/development/python-modules/openaiauth/default.nix
+++ b/pkgs/development/python-modules/openaiauth/default.nix
@ -6,12 +6,12 @@

 buildPythonPackage rec {
  pname = "openaiauth";
-  version = "0.3.6";
+  version = "1.0.2";

  src = fetchPypi {
    inherit version;
    pname = "OpenAIAuth";
-    hash = "sha256-SaiTqs2HVv5ajUkrLJv24ed1+iJg5HqsCNe0IETkA00=";
+    hash = "sha256-0Vd8gvE2guHNlrPBahu23NpUFrJHvm6Q6NSNawX9gbY=";
  };

  propagatedBuildInputs = [ requests ];
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "publicsuffixlist";
-  version = "0.10.0.20230611";
+  version = "0.10.0.20230614";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-z5mh/8sFulky9LX0LPwBuYWebjsqWc0EsPjDZMuTCX8=";
+    hash = "sha256-8tB95lcW4IQBeU5cY0YFfLKW3a0g1SQH9sJbn0cduho=";
  };

  passthru.optional-dependencies = {
--- a/pkgs/development/python-modules/pygnmi/default.nix
+++ b/pkgs/development/python-modules/pygnmi/default.nix
@ -0,0 +1,46 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, cryptography
+, dictdiffer
+, grpcio
+, protobuf
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "pygnmi";
+  version = "0.8.12";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "akarneliuk";
+    repo = "pygnmi";
+    rev = "v${version}";
+    sha256 = "sha256-5dAjN/HDFKQmJIjhergBjSmHQKhBxqy/Jneh1pLCHrw=";
+  };
+
+  propagatedBuildInputs = [
+    cryptography
+    dictdiffer
+    grpcio
+    protobuf
+  ];
+
+  # almost all tests fail with:
+  # TypeError: expected string or bytes-like object
+  doCheck = false;
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "pygnmi" ];
+
+  meta = with lib; {
+    description = "Pure Python gNMI client to manage network functions and collect telemetry";
+    homepage = "https://github.com/akarneliuk/pygnmi";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
--- a/pkgs/development/python-modules/pylion/default.nix
+++ b/pkgs/development/python-modules/pylion/default.nix
@ -0,0 +1,55 @@
+{ lib
+, buildPythonPackage
+, fetchFromBitbucket
+, h5py
+, termcolor
+, pexpect
+, jinja2
+, sphinxHook
+, sphinx-rtd-theme
+}:
+
+buildPythonPackage {
+  pname = "pylion";
+  version = "0.5.2";
+  format = "setuptools";
+
+  src = fetchFromBitbucket {
+    owner = "dtrypogeorgos";
+    repo = "pylion";
+    # Version is set in setup.cfg, but not in a git tag / bitbucket release
+    rev = "8945a7b6f1912ae6b9c705f8a2bd521101f5ba59";
+    hash = "sha256-4AdJkoQ1hAssDUpgmARGmN+ihQqRPPOncWJ5ErQyWII=";
+  };
+
+  # Docs are not available online, besides the article:
+  # http://dx.doi.org/10.1016/j.cpc.2020.107187
+  nativeBuildInputs = [
+    sphinxHook
+    sphinx-rtd-theme
+  ];
+
+  propagatedBuildInputs = [
+    h5py
+    termcolor
+    pexpect
+    jinja2
+  ];
+
+  pythonImportsCheck = [ "pylion" ];
+
+  # Tests fail from some reason - some files seem to be missing from the repo.
+  doCheck = false;
+
+  postInstall = ''
+    mkdir -p $out/share/doc/$name
+    cp -r examples $out/share/doc/$name/examples
+  '';
+
+  meta = with lib; {
+    description = "A LAMMPS wrapper for molecular dynamics simulations of trapped ions";
+    homepage = "https://bitbucket.org/dtrypogeorgos/pylion";
+    license = licenses.mit;
+    maintainers = with maintainers; [ doronbehar ];
+  };
+}
--- a/pkgs/development/python-modules/pytest-annotate/default.nix
+++ b/pkgs/development/python-modules/pytest-annotate/default.nix
@ -37,7 +37,7 @@ buildPythonPackage rec {
  ];

  meta = with lib; {
-    broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
+    broken = stdenv.isDarwin;
    description = "Generate PyAnnotate annotations from your pytest tests";
    homepage = "https://github.com/kensho-technologies/pytest-annotate";
    license = licenses.asl20;
--- a/pkgs/development/python-modules/rstcheck/default.nix
+++ b/pkgs/development/python-modules/rstcheck/default.nix
@ -7,6 +7,7 @@
 , pydantic
 , pytestCheckHook
 , pythonOlder
+, pythonRelaxDepsHook
 , rstcheck-core
 , typer
 , types-docutils
@ -27,8 +28,13 @@ buildPythonPackage rec {
    hash = "sha256-UMByfnnP1va3v1IgyQL0f3kC+W6HoiWScb7U2FAvWkU=";
  };

+  pythonRelaxDeps = [
+    "typer"
+  ];
+
  nativeBuildInputs = [
    poetry-core
+    pythonRelaxDepsHook
  ];

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/simplekv/default.nix
+++ b/pkgs/development/python-modules/simplekv/default.nix
@ -0,0 +1,48 @@
+{ lib
+, buildPythonPackage
+, dulwich
+, fetchFromGitHub
+, mock
+, pytestCheckHook
+, pythonOlder
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "simplekv";
+  version = "0.14.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "mbr";
+    repo = "simplekv";
+    rev = "refs/tags/${version}";
+    hash = "sha256-seUGDj2q84+AjDFM1pxMLlHbe9uBgEhmqA96UHjnCmo=";
+  };
+
+  nativeCheckInputs = [
+    dulwich
+    mock
+    pytestCheckHook
+    six
+  ];
+
+  pythonImportsCheck = [
+    "simplekv"
+  ];
+
+  disabledTests = [
+    # Issue with fixture
+    "test_concurrent_mkdir"
+  ];
+
+  meta = with lib; {
+    description = "A simple key-value store for binary data";
+    homepage = "https://github.com/mbr/simplekv";
+    changelog = "https://github.com/mbr/simplekv/releases/tag/${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@ -1,4 +1,5 @@
 { lib
+, stdenv
 , blis
 , buildPythonPackage
 , callPackage
@ -17,6 +18,7 @@
 , pytest
 , python
 , pythonOlder
+, pythonRelaxDepsHook
 , requests
 , setuptools
 , spacy-legacy
@ -28,7 +30,6 @@
 , typing-extensions
 , wasabi
 , writeScript
-, stdenv
 , nix
 , git
 , nix-update
@ -36,16 +37,24 @@

 buildPythonPackage rec {
  pname = "spacy";
-  version = "3.5.2";
+  version = "3.5.3";
  format = "setuptools";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-IsH/qrKFt0dwA9S1sDhBTMMkaKaQ1HkBW5ppjFMcgTs=";
+    hash = "sha256-NZcdZyFXZTjWxCPGagnOAL9m4Q5AcmpXt6gZkxgMJIw=";
  };

+  pythonRelaxDeps = [
+    "typer"
+  ];
+
+  nativeBuildInputs = [
+    pythonRelaxDepsHook
+  ];
+
  propagatedBuildInputs = [
    blis
    catalogue
@ -70,9 +79,7 @@ buildPythonPackage rec {
    wasabi
  ] ++ lib.optionals (pythonOlder "3.8") [
    typing-extensions
-  ];
-
-  postPatch = ''
+  ];  postPatch = ''
    substituteInPlace setup.cfg \
      --replace "typer>=0.3.0,<0.5.0" "typer>=0.3.0"
  '';
@ -82,6 +89,7 @@ buildPythonPackage rec {
  ];

  doCheck = false;
+
  checkPhase = ''
    ${python.interpreter} -m pytest spacy/tests --vectors --models --slow
  '';
--- a/pkgs/development/python-modules/sqltrie/default.nix
+++ b/pkgs/development/python-modules/sqltrie/default.nix
@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "sqltrie";
-  version = "0.5.0";
+  version = "0.6.0";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "iterative";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-caCzFHQG0fnSmIdesk4k1W/VheY1DWxZb2W8/Xen/ZU=";
+    hash = "sha256-f3nQMkDI4n/hORW038KL+LQcyc6Hzx1MDrcChk7W8t4=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
--- a/pkgs/development/python-modules/teslajsonpy/default.nix
+++ b/pkgs/development/python-modules/teslajsonpy/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "teslajsonpy";
-  version = "3.8.1";
+  version = "3.9.0";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "zabuldon";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-RPR1ek1gpbermSRaGqT2v31UVB6044E2ZxIqv1yr2bs=";
+    hash = "sha256-6H8miS0tKB99ZkiBvqJ77NIsswJ+ivYt1VZOLwTQr24=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/typer/default.nix
+++ b/pkgs/development/python-modules/typer/default.nix
@ -1,43 +1,40 @@
 { lib
 , stdenv
 , buildPythonPackage
+, click
 , colorama
+, coverage
 , fetchpatch
 , fetchPypi
 , flit-core
-, click
+, pytest-sugar
+, pytest-xdist
 , pytestCheckHook
+, pythonOlder
 , rich
 , shellingham
-, pytest-xdist
-, pytest-sugar
-, coverage
-, pythonOlder
+, typing-extensions
 }:

 buildPythonPackage rec {
  pname = "typer";
-  version = "0.7.0";
+  version = "0.9.0";
  format = "pyproject";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-/3l4RleKnyogG1NEKu3rVDMZRmhw++HHAeq2bddoEWU=";
+    hash = "sha256-UJIv15rqL0dRqOBAj/ENJmK9DIu/qEdVppnzutopeLI=";
  };

-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace "rich >=10.11.0,<13.0.0" "rich"
-  '';
-
  nativeBuildInputs = [
    flit-core
  ];

  propagatedBuildInputs = [
    click
+    typing-extensions
  ];

  passthru.optional-dependencies = {
@ -58,7 +55,10 @@ buildPythonPackage rec {
  preCheck = ''
    export HOME=$(mktemp -d);
  '';
-  disabledTests = lib.optionals stdenv.isDarwin [
+
+  disabledTests = [
+    "test_scripts"
+  ] ++ lib.optionals stdenv.isDarwin [
    # likely related to https://github.com/sarugaku/shellingham/issues/35
    "test_show_completion"
    "test_install_completion"
@ -73,6 +73,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Library for building CLI applications";
    homepage = "https://typer.tiangolo.com/";
+    changelog = "https://github.com/tiangolo/typer/releases/tag/${version}";
    license = licenses.mit;
    maintainers = with maintainers; [ winpat ];
  };
--- a/pkgs/development/python-modules/yalexs-ble/default.nix
+++ b/pkgs/development/python-modules/yalexs-ble/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "yalexs-ble";
-  version = "2.1.17";
+  version = "2.1.18";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "bdraco";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-mN3/spDTWJfSCsKcRV24+tIjWmxI1gsO5qGuAZykWY0=";
+    hash = "sha256-bLxKq/MNbVIv9CV67NeOqn49cYu7gwcBnbZEtlreQzQ=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/tools/frink/default.nix
+++ b/pkgs/development/tools/frink/default.nix
@ -8,16 +8,18 @@
 }:
 stdenv.mkDerivation rec {
  pname = "frink";
-  version = "2023-01-31";
+  version = "2023-05-22";

  src = fetchurl {
    # Upstream does not provide versioned download links
-    url = "https://web.archive.org/web/20230202134810/https://frinklang.org/frinkjar/frink.jar";
-    sha256 = "sha256-xs1FQvFPgeAxscAiwBBP8N8aYe0OlsYbH/vbzzCbYZc=";
+    url = "https://web.archive.org/web/20230526123219/https://frinklang.org/frinkjar/frink.jar";
+    sha256 = "sha256-IgINJvt9G5f1HELKhV5BHIu9NoA8STDqNg/dVTFzK0Y=";
  };

  dontUnpack = true;

+  nativeBuildInputs = [ jdk ];
+
  buildInputs = [ jdk rlwrap ];

  installPhase = ''
@ -27,9 +29,18 @@ stdenv.mkDerivation rec {

    cp ${src} $out/lib/frink.jar

+    # Generate rlwrap helper files.
+    # See https://frinklang.org/fsp/colorize.fsp?f=listUnits.frink
+    # and https://frinklang.org/fsp/colorize.fsp?f=listFunctions.frink
+    java -classpath "$out/lib/frink.jar" frink.gui.FrinkStarter -e 'joinln[lexicalSort[units[]]]' > $out/lib/unitnames.txt
+    java -classpath "$out/lib/frink.jar" frink.gui.FrinkStarter -e 'joinln[map[{|f|
+        f =~ %s/\s+//g
+        return "$f$"
+      }, lexicalSort[functions[]]]]' > $out/lib/functionnames.txt
+
    cat > "$out/bin/frink" << EOF
    #!${stdenv.shell}
-    exec ${rlwrap}/bin/rlwrap ${jdk}/bin/java -classpath "$out/lib/frink.jar" frink.gui.FrinkStarter "\$@"
+    exec ${rlwrap}/bin/rlwrap -f $out/lib/unitnames.txt -b '$' -f $out/lib/functionnames.txt ${jdk}/bin/java -classpath "$out/lib/frink.jar" frink.gui.FrinkStarter "\$@"
    EOF

    chmod a+x "$out/bin/frink"
--- a/pkgs/development/tools/gendef/default.nix
+++ b/pkgs/development/tools/gendef/default.nix
@ -0,0 +1,22 @@
+{ fetchgit, lib, stdenv }:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gendef";
+  version = "11.0.1";
+
+  src = fetchgit {
+    url = "https://git.code.sf.net/p/mingw-w64/mingw-w64.git";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-0vbAHSN+uwxoXXZtbuycP67PxjcB8Ftxd/Oij1gqE3Y=";
+  };
+
+  sourceRoot = "mingw-w64/mingw-w64-tools/gendef";
+
+  meta = {
+    description = "A tool which generate def files from DLLs";
+    homepage = "https://sourceforge.net/p/mingw-w64/wiki2/gendef/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ hughobrien ];
+    platforms = lib.platforms.linux;
+  };
+})
--- a/pkgs/development/tools/ocaml/merlin/4.x.nix
+++ b/pkgs/development/tools/ocaml/merlin/4.x.nix
@ -15,13 +15,15 @@
 }:

 let
-  merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.8" else "4.7";
+  merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.9" else "4.7";

  hashes = {
    "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y=";
    "4.7-413" = "sha256-aVmGWS4bJBLuwsxDKsng/n0A6qlyJ/pnDTcYab/5gyU=";
    "4.8-414" = "sha256-HMXWhcVOXW058y143rNBcfEOmjt2tZJXcXKHmKZ5i68=";
    "4.8-500" = "sha256-n5NHKuo0/lZmfe7WskqnW3xm1S0PmXKSS93BDKrpjCI=";
+    "4.9-414" = "sha256-4j/EeBNZEmn/nSfIIJiOUgpmLIndCvfqZSshUXSZy/0=";
+    "4.9-500" = "sha256-uQfGazoxTxclHSiTfjji+tKJv8MKqRdHMPD/xfMZlSY=";
  };

  ocamlVersionShorthand = lib.substring 0 3
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@ -11,15 +11,15 @@

 rustPlatform.buildRustPackage rec {
  pname = "deno";
-  version = "1.34.1";
+  version = "1.34.2";

  src = fetchFromGitHub {
    owner = "denoland";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-LpW1cbedMPG8VeuQldfYfnxdLrOeDSSf60WfYJbDwHw=";
+    hash = "sha256-FVSs/9TpLlPfgY/XRJJ2P8jXT9a0DIfPHAl4/400Mtk=";
  };
-  cargoHash = "sha256-HRsEekv1vSDm2Nk7xvcRmMfHxl4M6BWwHbdPNNop4Ic=";
+  cargoHash = "sha256-iiTAxxXi76bjkm47oazQ9AIwq8/jPDa7EsTn7ED0dO0=";

  postPatch = ''
    # upstream uses lld on aarch64-darwin for faster builds
--- a/pkgs/games/maptool/default.nix
+++ b/pkgs/games/maptool/default.nix
@ -12,11 +12,11 @@
 }:
 let
  pname = "maptool";
-  version = "1.13.0";
+  version = "1.13.1";
  repoBase = "https://github.com/RPTools/${pname}";
  src = fetchurl {
    url = "${repoBase}/releases/download/${version}/MapTool-${version}.jar";
-    hash = "sha256-0jiUYdr2KwMNc8VBgJsEsf4dkrzYfMGwv+jT1RLhUAg=";
+    hash = "sha256-EHisFvLaqi8VqIdygf0nxohKLL3c/yE5Y6jAcT0B2q0=";
  };

  icon = fetchurl {
--- a/pkgs/games/mudlet/default.nix
+++ b/pkgs/games/mudlet/default.nix
@ -54,14 +54,14 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "mudlet";
-  version = "4.17.0";
+  version = "4.17.2";

  src = fetchFromGitHub {
    owner = "Mudlet";
    repo = "Mudlet";
    rev = "Mudlet-${version}";
    fetchSubmodules = true;
-    hash = "sha256-j0d37C1TTb6ggXk1wTaqEcBKwsxE/B7Io90gTkc2q0M=";
+    hash = "sha256-K75frptePKfHeGQNXaX4lKsLwO6Rs6AAka6hvP8MA+k=";
  };

  nativeBuildInputs = [
@ -113,6 +113,8 @@ stdenv.mkDerivation rec {
    mkdir -pv $out/share/pixmaps
    cp -r ../mudlet.png $out/share/pixmaps/

+    cp -r ../translations $out/share/
+
    makeQtWrapper $out/mudlet $out/bin/mudlet \
      --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \
      --prefix LUA_PATH : "$NIX_LUA_PATH" \
--- a/pkgs/games/osu-lazer/bin.nix
+++ b/pkgs/games/osu-lazer/bin.nix
@ -7,21 +7,21 @@

 let
  pname = "osu-lazer-bin";
-  version = "2023.610.0";
+  version = "2023.614.1";
  name = "${pname}-${version}";

  osu-lazer-bin-src = {
    aarch64-darwin = {
      url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
-      sha256 = "sha256-MCQYtdTigE6Dyrst2KLoFthbrJjNXm3TQRiaTzp32Os=";
+      sha256 = "sha256-769a4mwBmA2aN03k/1TCXVIxJEwtXk9HRV/vDhTIZt4=";
    };
    x86_64-darwin = {
      url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
-      sha256 = "sha256-jA7fr9nntV5/J4/AUOH6HS6ZoYQ1ZZxY/ic6KeAch/c=";
+      sha256 = "sha256-mIPTWveiiyPN0P2WEtqnu4cq8hti1hw7RKUQ+YKDAVg=";
    };
    x86_64-linux = {
      url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
-      sha256 = "sha256-QAFbTn30lSOjEC1ZT9caUR2WQmz+bNDhpd3RL7OJWWI=";
+      sha256 = "sha256-UVq60UrV8yl2fWizk8smRLQzBtj30oaKSJkgeze7OfE=";
    };
  }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");

--- a/pkgs/games/osu-lazer/default.nix
+++ b/pkgs/games/osu-lazer/default.nix
@ -17,13 +17,13 @@

 buildDotnetModule rec {
  pname = "osu-lazer";
-  version = "2023.610.0";
+  version = "2023.614.1";

  src = fetchFromGitHub {
    owner = "ppy";
    repo = "osu";
    rev = version;
-    sha256 = "sha256-2oCv+6cxhz1PU4Jh9Ux8RAcksqWiq2VVE6aKi6bJDIw=";
+    sha256 = "sha256-CL9fEIg8Wt9BTM+hisXl8k9VWWbF/dlT0bOBeVeAoNE=";
  };

  projectFile = "osu.Desktop/osu.Desktop.csproj";
--- a/pkgs/games/osu-lazer/deps.nix
+++ b/pkgs/games/osu-lazer/deps.nix
@ -137,7 +137,7 @@
  (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.608.0"; sha256 = "0qf9z0307sh1skixql23v4vjkz1jwz6qhjdzqhhyb708hx9p7a03"; })
  (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2022.525.0"; sha256 = "1zsqj3xng06bb46vg79xx35n2dsh3crqg951r1ga2gxqzgzy4nk0"; })
  (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2022.1222.1"; sha256 = "1pwwsp4rfzl6166mhrn5lsnyazpckhfh1m6ggf9d1lw2wb58vxfr"; })
-  (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.510.0"; sha256 = "155rjpr0vv4a2ar1xmh2zvg9rw07xii72gg11g5jkk5qxm9lkgk0"; })
+  (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.605.0"; sha256 = "1628yh97ginvx0i1dlpkmkw9hzvri5fj11b111lqy7xirfy7i66b"; })
  (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; })
  (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.669-alpha"; sha256 = "0frazc37k9nqzk3sqcy3jzibg9v6dp0ga95yx0rkmjm8jfbw3l9r"; })
  (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-g31346ea477"; sha256 = "0wrb1skyj58p23ryjkmlk8f1sdhplr5c43w31sw8bhv0yqmhjd80"; })
--- a/pkgs/games/unciv/default.nix
+++ b/pkgs/games/unciv/default.nix
@ -25,11 +25,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "unciv";
-  version = "4.6.15";
+  version = "4.6.19";

  src = fetchurl {
    url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
-    hash = "sha256-69JEf5dG3Nf4CLT8eKfeo/8givyyxb9QpQSAZ2dG7TI=";
+    hash = "sha256-21Pge/b6pZ4csGVr2J0V6rwZGKBEEqEkuef+7imGtl4=";
  };

  dontUnpack = true;
--- a/pkgs/os-specific/linux/apfs/default.nix
+++ b/pkgs/os-specific/linux/apfs/default.nix
@ -44,7 +44,6 @@ stdenv.mkDerivation {
    homepage = "https://github.com/linux-apfs/linux-apfs-rw";
    license = licenses.gpl2Only;
    platforms = platforms.linux;
-    broken = kernel.kernelOlder "4.9";
    maintainers = with maintainers; [ Luflosi ];
  };
 }
--- a/pkgs/os-specific/linux/rtl8192eu/default.nix
+++ b/pkgs/os-specific/linux/rtl8192eu/default.nix
@ -6,13 +6,13 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi

 in stdenv.mkDerivation rec {
  pname = "rtl8192eu";
-  version = "${kernel.version}-4.4.1.20220614";
+  version = "${kernel.version}-4.4.1.20230613";

  src = fetchFromGitHub {
    owner = "Mange";
    repo = "rtl8192eu-linux-driver";
-    rev = "6ba1f320963376f15ea216238c0b62ff3e71fa82";
-    sha256 = "sha256-c5swRxSjWT1tCcR7tfFKdAdVVmAEYgMZuOwUxGYYESI=";
+    rev = "f2fc8af7ab58d2123eed1aa4428e713cdfc27976";
+    sha256 = "sha256-OgsxBcXoIP8h9Z0bLsG91/s/+r89Tdn2dPOt4p3sx8k=";
  };

  hardeningDisable = [ "pic" ];
@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
    homepage = "https://github.com/Mange/rtl8192eu-linux-driver";
    license = licenses.gpl2Only;
    platforms = platforms.linux;
-    broken = stdenv.hostPlatform.isAarch64 || kernel.kernelAtLeast "5.18";
+    broken = stdenv.hostPlatform.isAarch64;
    maintainers = with maintainers; [ troydm ];
  };
 }
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@ -15,16 +15,16 @@ let
 in
 buildGoModule rec {
  pname = "minio";
-  version = "2023-05-27T05-56-19Z";
+  version = "2023-06-09T07-32-12Z";

  src = fetchFromGitHub {
    owner = "minio";
    repo = "minio";
    rev = "RELEASE.${version}";
-    sha256 = "sha256-HwyPrXywhJ0D/eelcPOE8CPrEeJkaLr7wMdW5O+8cZA=";
+    sha256 = "sha256-YhABdJ+4KU/UGRukCR4iQ4ClHUz/icbIO/yd8rGIs48=";
  };

-  vendorHash = "sha256-jvJM4I5ruDYwJsB258aZ3UP9FjtzYc0XSYpXdjqafMI=";
+  vendorHash = "sha256-c2rB8Or4tt84caEmfbwcHCow3/fllk0mNW0R/MwB5Vg=";

  doCheck = false;

--- a/pkgs/servers/search/quickwit/Cargo.lock
+++ b/pkgs/servers/search/quickwit/Cargo.lock
--- a/pkgs/servers/search/quickwit/default.nix
+++ b/pkgs/servers/search/quickwit/default.nix
@ -0,0 +1,85 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, rustPlatform
+, nix-update-script
+, protobuf
+, Security
+}:
+
+let
+  pname = "quickwit";
+  version = "0.6.1";
+in
+rustPlatform.buildRustPackage {
+  inherit pname version;
+
+  src = fetchFromGitHub {
+    owner = "quickwit-oss";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-MzPFS1f7AdqfFKSBJHoL0h1nbzRlMJt35msoQ6Ual/Q=";
+  };
+
+  postPatch = ''
+    substituteInPlace ./quickwit-ingest/build.rs \
+      --replace '&[]' '&["."]'
+    substituteInPlace ./quickwit-control-plane/build.rs \
+      --replace '&[]' '&["."]'
+    substituteInPlace ./quickwit-codegen/example/build.rs \
+      --replace '&[]' '&["."]'
+  '';
+
+  sourceRoot = "source/quickwit";
+
+  buildInputs = lib.optionals stdenv.isDarwin [ Security ];
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "chitchat-0.5.0" = "sha256-gGWMzTzQNb9JXSbPIanMJpEKhKen1KsIrWQz6wvypDY=";
+      "ownedbytes-0.5.0" = "sha256-+hfp2r/m4Mu+HUXy3gfyU4klHqq+5k363Tpc34IWgLQ=";
+      "path-0.1.0" = "sha256-f+Iix+YuKy45zoQXH7ctzANaL96s7HNUBOhcM1ZV0Ko=";
+      "pulsar-5.0.2" = "sha256-j7wpsAro6x4fk3pvSL4fxLkddJFq8duZ7jDj0Edf3YQ=";
+      "sasl2-sys-0.1.20+2.1.28" = "sha256-u4BsfmTDFxuY3i1amLCsr7MDv356YPThMHclura0Sxs=";
+    };
+  };
+
+  # needed for internal protobuf c wrapper library
+  PROTOC = "${protobuf}/bin/protoc";
+  PROTOC_INCLUDE = "${protobuf}/include";
+
+  passthru.updateScript = nix-update-script { };
+
+  checkFlags = [
+    # tries to make a network access
+    "--skip=test_all_local_index"
+    "--skip=test_cmd_create"
+    "--skip=test_cmd_create_no_index_uri"
+    "--skip=test_cmd_search_aggregation"
+    "--skip=test_cmd_search_with_snippets"
+    "--skip=test_delete_index_cli"
+    "--skip=test_delete_index_cli_dry_run"
+    "--skip=test_ingest_docs_cli"
+    "--skip=test_ingest_docs_cli_keep_cache"
+    "--skip=test_search_index_cli"
+    "--skip=test_garbage_collect_cli_no_grace"
+    "--skip=actors::indexing_service::tests::test_indexing_service_spawn_observe_detach"
+    "--skip=object_storage::s3_compatible_storage::tests::test_s3_compatible_storage_relative_path"
+    # flaky test
+    "--skip=actors::indexer::tests::test_indexer_triggers_commit_on_drained_mailbox"
+    "--skip=actors::indexer::tests::test_indexer_partitioning"
+    "--skip=actors::indexing_pipeline::tests::test_merge_pipeline_does_not_stop_on_indexing_pipeline_failure"
+    # fail on darwin for some reason
+    "--skip=io::tests::test_controlled_writer_limited_async"
+    "--skip=io::tests::test_controlled_writer_limited_sync"
+  ];
+
+  meta = with lib; {
+    description = "Sub-second search & analytics engine on cloud storage";
+    homepage = "https://quickwit.io/";
+    license = licenses.agpl3Only;
+    maintainers = with maintainers; [ happysalada ];
+    platforms = platforms.all;
+  };
+}
--- a/pkgs/servers/sql/postgresql/ext/pgvector.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "pgvector";
-  version = "0.4.3";
+  version = "0.4.4";

  src = fetchFromGitHub {
    owner = "pgvector";
    repo = "pgvector";
    rev = "v${version}";
-    hash = "sha256-WkbY/jc34ueJ6INIt9XCEW9jK7wUizeChgFXL9doZ4Q=";
+    hash = "sha256-D2jB0rks4zmWtGB7SCXG5XW0PCun8OPawp3W/VGRQn0=";
  };

  buildInputs = [ postgresql ];
--- a/pkgs/servers/web-apps/jitsi-meet/default.nix
+++ b/pkgs/servers/web-apps/jitsi-meet/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "jitsi-meet";
-  version = "1.0.7235";
+  version = "1.0.7322";

  src = fetchurl {
    url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2";
-    sha256 = "OlAInpGl6I5rKgIsO3nXUQfksU326lsSDdiZdCYM3NU=";
+    sha256 = "BjoNu1cQOw9JjX6i2R/K8Txx6m6ndVRnWPjze9y14pQ=";
  };

  dontBuild = true;
--- a/pkgs/tools/admin/scaleway-cli/default.nix
+++ b/pkgs/tools/admin/scaleway-cli/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "scaleway-cli";
-  version = "2.15.0";
+  version = "2.16.1";

  src = fetchFromGitHub {
    owner = "scaleway";
    repo = "scaleway-cli";
    rev = "v${version}";
-    sha256 = "sha256-iKyUtUm+vDwHZmjoeNTEE3rabw0krSganaHiEIN9BWE=";
+    sha256 = "sha256-bKqlI2t7fBkKxtQPaboDsov206eD9bWpxAugaUFBIRc=";
  };

-  vendorHash = "sha256-m03VMzLCBASn0O66Zh/E7UlC6GmgghgY0rdcKadL3mk=";
+  vendorHash = "sha256-Y28j4vgGZ23yV2SqIsfhtc/Kj4g+Lgju/t2w+3xarnE=";

  ldflags = [
    "-w"
--- a/pkgs/tools/archivers/arc_unpacker/default.nix
+++ b/pkgs/tools/archivers/arc_unpacker/default.nix
@ -1,7 +1,20 @@
-{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, boost, libpng, libiconv
-, libjpeg, zlib, openssl, libwebp, catch2 }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, cmake
+, makeWrapper
+, boost
+, libpng
+, libiconv
+, libjpeg
+, zlib
+, openssl
+, libwebp
+, catch2
+}:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "arc_unpacker";
  version = "unstable-2021-08-06";

@ -12,14 +25,35 @@ stdenv.mkDerivation rec {
    hash = "sha256-STbdWH7Mr3gpOrZvujblYrIIKEWBHzy1/BaNuh4teI8=";
  };

-  nativeBuildInputs = [ cmake makeWrapper catch2 ];
-  buildInputs = [ boost libiconv libjpeg libpng libwebp openssl zlib ];
+  patches = [
+    (fetchpatch {
+      name = "failing_tests.patch";
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/failing_tests.patch?h=arc_unpacker-git&id=bda1ad9f69e6802e703b2e6913d71a36d76cfef9";
+      hash = "sha256-bClACsf/+SktyLAPtt7EcSqprkw8JVIi1ZLpcJcv9IE=";
+    })
+  ];

  postPatch = ''
    cp ${catch2}/include/catch2/catch.hpp tests/test_support/catch.h
    sed '1i#include <limits>' -i src/dec/eagls/pak_archive_decoder.cc # gcc12
  '';

+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+    catch2
+  ];
+
+  buildInputs = [
+    boost
+    libiconv
+    libjpeg
+    libpng
+    libwebp
+    openssl
+    zlib
+  ];
+
  checkPhase = ''
    runHook preCheck

--- a/pkgs/tools/backup/borgmatic/default.nix
+++ b/pkgs/tools/backup/borgmatic/default.nix
@ -13,11 +13,11 @@

 python3Packages.buildPythonApplication rec {
  pname = "borgmatic";
-  version = "1.7.9";
+  version = "1.7.14";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-v3Qxwy7V6rqX90G4/Xp6mVTUkrqDXmudgh3th0GCjuk=";
+    sha256 = "sha256-rABJfdrV+D2v6yHpAbzj/0MSGc9bo49pwXEC45Mmmlk=";
  };

  nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ];
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@ -21,11 +21,11 @@ let
 in
 (if withQt then mkDerivation else stdenv.mkDerivation) rec {
  pname = "gnuplot";
-  version = "5.4.6";
+  version = "5.4.8";

  src = fetchurl {
    url = "mirror://sourceforge/gnuplot/${pname}-${version}.tar.gz";
-    sha256 = "sha256-AvwnkYIA7WTY8MO4T+gblbWc1HrZnycJOa5JfBnydBk=";
+    sha256 = "sha256-kxJ5x8qtGv99RstHZvH/QcJtm+na8Lzwx53u7j2R9c8=";
  };

  nativeBuildInputs = [ makeWrapper pkg-config texinfo ] ++ lib.optional withQt qttools;
--- a/pkgs/tools/misc/ffsend/default.nix
+++ b/pkgs/tools/misc/ffsend/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, rustPlatform, pkg-config, openssl
+{ lib, stdenv, fetchFromGitLab, fetchpatch, rustPlatform, pkg-config, openssl
 , installShellFiles
 , Security, AppKit

@ -24,7 +24,38 @@ rustPlatform.buildRustPackage rec {
    sha256 = "sha256-L1j1lXPxy9nWMeED9uzQHV5y7XTE6+DB57rDnXa4kMo=";
  };

-  cargoSha256 = "sha256-zNLU9QnBGna5qb+iu2imOUvCIw3ZWRFsQlpFo5ECtKo=";
+  cargoHash = "sha256-r1yIPV2sW/EpHJpdaJyi6pzE+rtNkBIxSUJF+XA8kbA=";
+
+  cargoPatches = [
+
+    # Update dependencies (needed for the below patch to merge cleanly)
+    (fetchpatch {
+      name = "Update-dependencies-1";
+      url = "https://github.com/timvisee/ffsend/commit/afb004680b9ed672c7e87ff23f16bb2c51fea06e.patch";
+      hash = "sha256-eDcbyi05aOq+muVWdLmlLzLXUKcrv/9Y0R+0aHgL4+s=";
+    })
+
+    # Disable unused features in prettytable-rs crate (needed for the below patch to merge cleanly)
+    (fetchpatch {
+      name = "Disable-unused-features";
+      url = "https://github.com/timvisee/ffsend/commit/9b8dee12ea839f911ed207ff9602d929cab5d34b.patch";
+      hash = "sha256-6LK1Fqov+zEbPZ4+B6JCLXtXmgSad9vr9YO2oYodBSM=";
+    })
+
+    # Update dependencies (needed for the below patch to merge cleanly)
+    (fetchpatch {
+      name = "Update-dependencies-2";
+      url = "https://github.com/timvisee/ffsend/commit/fd5b38f9ab9cbc5f962d1024f4809eb36ba8986c.patch";
+      hash = "sha256-BDZKrVtQHpOewmB2Lb6kUfy02swcNK+CYZ3lj3kwFV4=";
+    })
+
+    # Fix seg fault
+    (fetchpatch {
+      name = "Fix-segfault";
+      url = "https://github.com/timvisee/ffsend/commit/3c1c2dc28ca1d88c45f87496a7a96052f5c37858.patch";
+      hash = "sha256-2hWlFXDopNy26Df74nJoB1J8qzPEOpf61wEOEtxOVx8=";
+    })
+  ];

  nativeBuildInputs = [ installShellFiles ]
    ++ lib.optionals stdenv.isLinux [ pkg-config ];
--- a/pkgs/tools/misc/ugs/default.nix
+++ b/pkgs/tools/misc/ugs/default.nix
@ -0,0 +1,53 @@
+{ stdenv
+, lib
+, copyDesktopItems
+, makeDesktopItem
+, makeWrapper
+, jre
+, fetchzip
+, bash
+}:
+let
+  desktopItem = makeDesktopItem {
+    name = "ugs";
+    exec = "ugs";
+    comment = "A cross-platform G-Code sender for GRBL, Smoothieware, TinyG and G2core.";
+    desktopName = "Universal-G-Code-Sender";
+    categories = [ "Game" ];
+  };
+
+in
+stdenv.mkDerivation rec {
+  pname = "ugs";
+  version = "2.0.17";
+
+  src = fetchzip {
+    url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip";
+    hash = "sha256-m4oD0ibrlVwP8ZS1pjnu/QaWmQMQlAWtZV2MGhB9X1A=";
+  };
+
+  dontUnpack = true;
+
+  nativeBuildInputs = [ copyDesktopItems makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    makeWrapper ${jre}/bin/java $out/bin/ugs \
+      --prefix PATH : ${lib.makeBinPath [ jre ]} \
+      --add-flags "-jar ${src}/UniversalGcodeSender.jar"
+
+    runHook postInstall
+  '';
+
+  desktopItems = [ desktopItem ];
+
+  meta = with lib; {
+    description = "A cross-platform G-Code sender for GRBL, Smoothieware, TinyG and G2core.";
+    homepage = "https://github.com/winder/Universal-G-Code-Sender";
+    maintainers = with maintainers; [ matthewcroughan ];
+    sourceProvenance = with sourceTypes; [ binaryBytecode ];
+    license = licenses.gpl3;
+    platforms = platforms.all;
+  };
+}
--- a/pkgs/tools/security/cloudfox/default.nix
+++ b/pkgs/tools/security/cloudfox/default.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "cloudfox";
-  version = "1.10.3";
+  version = "1.11.1";

  src = fetchFromGitHub {
    owner = "BishopFox";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-XLn2GwoVNPoGTgXZx/q9dEmWigKB1BNylzxO9dBT3Zg=";
+    hash = "sha256-46w0/Da5sJkw2jLEGiFICEaX9bvCs0sbad1RyDCxINw=";
  };

-  vendorHash = "sha256-v8rEsp2mDgfjCO2VvWNIxex8F350MDnZ40bR4szv+3o=";
+  vendorHash = "sha256-lgccNq1cSg8rrHW0aMLcC5HrZXf8TvdFSmk6pbGXNqQ=";

  # Some tests are failing because of wrong filename/path
  doCheck = false;
--- a/pkgs/tools/system/ttop/default.nix
+++ b/pkgs/tools/system/ttop/default.nix
@ -1,6 +1,6 @@
 { lib, nimPackages, fetchFromGitHub }:

-nimPackages.buildNimPackage rec {
+nimPackages.buildNimPackage (finalAttrs: {
  pname = "ttop";
  version = "1.0.1";
  nimBinOnly = true;
@ -8,17 +8,17 @@ nimPackages.buildNimPackage rec {
  src = fetchFromGitHub {
    owner = "inv2004";
    repo = "ttop";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
    hash = "sha256-x4Uczksh6p3XX/IMrOFtBxIleVHdAPX9e8n32VAUTC4=";
  };

  buildInputs = with nimPackages; [ asciigraph illwill parsetoml zippy ];

  meta = with lib;
-    src.meta // {
+    finalAttrs.src.meta // {
      description = "Top-like system monitoring tool";
      license = licenses.mit;
      platforms = platforms.linux;
      maintainers = with maintainers; [ sikmir ];
    };
-}
+})
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -484,6 +484,7 @@ mapAliases ({
  ### F ###

  facette = throw "facette has been removed"; # Added 2020-01-06
+  faustStk = faustPhysicalModeling; # Added 2023-05-16
  fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # Added 2020-03-28
  fastnlo = fastnlo_toolkit; # Added 2021-04-24
  fbreader = throw "fbreader has been removed, as the upstream project has been archived"; # Added 2022-05-26
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -589,6 +589,8 @@ with pkgs;

  functiontrace-server = callPackage ../development/tools/functiontrace-server { };

+  gendef = callPackage ../development/tools/gendef { };
+
  glade = callPackage ../development/tools/glade { };

  goda = callPackage ../development/tools/goda { };
@ -1359,9 +1361,7 @@ with pkgs;
    type = "OPN";
  };

-  arc_unpacker = callPackage ../tools/archivers/arc_unpacker {
-    boost = boost175; # checkPhase fails with Boost 1.77
-  };
+  arc_unpacker = callPackage ../tools/archivers/arc_unpacker { };

  adminer = callPackage ../servers/adminer { };

@ -11803,6 +11803,10 @@ with pkgs;

  quicktun = callPackage ../tools/networking/quicktun { };

+  quickwit = callPackage ../servers/search/quickwit {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
  quilt = callPackage ../development/tools/quilt { };

  raider = callPackage ../applications/misc/raider { };
@ -13455,6 +13459,8 @@ with pkgs;

  ugrep = callPackage ../tools/text/ugrep { };

+  ugs = callPackage ../tools/misc/ugs { };
+
  uhk-agent = callPackage ../os-specific/linux/uhk-agent { };

  uhk-udev-rules = callPackage ../os-specific/linux/uhk-udev-rules { };
@ -17112,6 +17118,8 @@ with pkgs;

  davmail = callPackage ../applications/networking/davmail { };

+  kamilalisp = callPackage ../development/interpreters/kamilalisp { };
+
  kanif = callPackage ../applications/networking/cluster/kanif { };

  kona = callPackage ../development/interpreters/kona { };
@ -32968,7 +32976,7 @@ with pkgs;

  neomutt = callPackage ../applications/networking/mailreaders/neomutt { };

-  natron = callPackage ../applications/video/natron { };
+  natron = libsForQt5.callPackage ../applications/video/natron { };

  natural-docs = callPackage ../applications/misc/natural-docs { };

@ -39119,7 +39127,7 @@ with pkgs;

  faust2 = callPackage ../applications/audio/faust/faust2.nix { };

-  faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { };
+  faust2alqt = libsForQt5.callPackage ../applications/audio/faust/faust2alqt.nix { };

  faust2alsa = callPackage ../applications/audio/faust/faust2alsa.nix { };

@ -39133,18 +39141,16 @@ with pkgs;

  faust2jackrust = callPackage ../applications/audio/faust/faust2jackrust.nix { };

-  faust2jaqt = callPackage ../applications/audio/faust/faust2jaqt.nix { };
+  faust2jaqt = libsForQt5.callPackage ../applications/audio/faust/faust2jaqt.nix { };

  faust2ladspa = callPackage ../applications/audio/faust/faust2ladspa.nix { };

-  faust2lv2 = callPackage ../applications/audio/faust/faust2lv2.nix { };
+  faust2lv2 = libsForQt5.callPackage ../applications/audio/faust/faust2lv2.nix { };

  faustlive = callPackage ../applications/audio/faust/faustlive.nix { };

  faustPhysicalModeling = callPackage ../applications/audio/faustPhysicalModeling  { };

-  faustStk = callPackage ../applications/audio/faustStk  { };
-
  flockit = callPackage ../tools/backup/flockit { };

  fahclient = callPackage ../applications/science/misc/foldingathome/client.nix { };
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -544,6 +544,8 @@ self: super: with self; {

  apispec = callPackage ../development/python-modules/apispec { };

+  apispec-webframeworks = callPackage ../development/python-modules/apispec-webframeworks { };
+
  aplpy = callPackage ../development/python-modules/aplpy { };

  app-model = callPackage ../development/python-modules/app-model { };
@ -3562,6 +3564,8 @@ self: super: with self; {

  filecheck = callPackage ../development/python-modules/filecheck { };

+  filedepot = callPackage ../development/python-modules/filedepot { };
+
  filelock = callPackage ../development/python-modules/filelock { };

  filetype = callPackage ../development/python-modules/filetype { };
@ -7709,6 +7713,8 @@ self: super: with self; {

  pygments-style-github = callPackage ../development/python-modules/pygments-style-github { };

+  pygnmi = callPackage ../development/python-modules/pygnmi { };
+
  pygti = callPackage ../development/python-modules/pygti { };

  pyheos = callPackage ../development/python-modules/pyheos { };
@ -8817,6 +8823,8 @@ self: super: with self; {

  pylint-venv = callPackage ../development/python-modules/pylint-venv { };

+  pylion = callPackage ../development/python-modules/pylion { };
+
  pylitterbot = callPackage ../development/python-modules/pylitterbot { };

  py-libzfs = callPackage ../development/python-modules/py-libzfs { };
@ -11201,6 +11209,8 @@ self: super: with self; {

  simplekml = callPackage ../development/python-modules/simplekml { };

+  simplekv = callPackage ../development/python-modules/simplekv { };
+
  simplenote = callPackage ../development/python-modules/simplenote { };

  simplesat = callPackage ../development/python-modules/simplesat { };