Merge staging-next into staging

2025-01-18 19:03:28 +00:00 · 2023-02-10 06:01:53 +00:00 · 2023-02-10 06:01:53 +00:00 · f72b07e57d
commit f72b07e57d
parent 0417b0e54f bff8e74964
74 changed files with 2069 additions and 733 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -14870,7 +14870,7 @@
  };
  toastal = {
    email = "toastal+nix@posteo.net";
-    matrix = "@toastal:matrix.org";
+    matrix = "@toastal:chat.mozilla.org";
    github = "toastal";
    githubId = 561087;
    name = "toastal";
--- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
@ -914,6 +914,14 @@
          (<link linkend="opt-services.fwupd.daemonSettings"><literal>services.fwupd.daemonSettings</literal></link>).
        </para>
      </listitem>
+      <listitem>
+        <para>
+          <literal>services.xserver.desktopManager.plasma5.phononBackend</literal>
+          now defaults to vlc according to
+          <link xlink:href="https://community.kde.org/Distributions/Packaging_Recommendations#Non-Plasma_packages">upstrean
+          recommendation</link>
+        </para>
+      </listitem>
      <listitem>
        <para>
          The <literal>zramSwap</literal> is now implemented with
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@ -223,6 +223,8 @@ In addition to numerous new and upgraded packages, this release has the followin

 - The `services.fwupd` module now allows arbitrary daemon settings to be configured in a structured manner ([`services.fwupd.daemonSettings`](#opt-services.fwupd.daemonSettings)).

+- `services.xserver.desktopManager.plasma5.phononBackend` now defaults to vlc according to [upstrean recommendation](https://community.kde.org/Distributions/Packaging_Recommendations#Non-Plasma_packages)
+
 - The `zramSwap` is now implemented with `zram-generator`, and the option `zramSwap.numDevices` for using ZRAM devices as general purpose ephemeral block devices has been removed.

 - As Singularity has renamed to [Apptainer](https://apptainer.org/news/community-announcement-20211130)
--- a/nixos/modules/services/networking/minidlna.nix
+++ b/nixos/modules/services/networking/minidlna.nix
@ -16,7 +16,7 @@ in
    description = lib.mdDoc ''
      Whether to enable MiniDLNA, a simple DLNA server.
      It serves media files such as video and music to DLNA client devices
-      such as televisions and media players. If you use the firewall consider
+      such as televisions and media players. If you use the firewall, consider
      adding the following: `services.minidlna.openFirewall = true;`
    '';
  };
@ -54,10 +54,7 @@ in
        description = lib.mdDoc ''
          The interval between announces (in seconds).
          Instead of waiting for announces, you should set `openFirewall` option to use SSDP discovery.
-          Furthermore, this option has been set to 90000 in order to prevent disconnects with certain
-          clients and relies solely on the discovery.
-
-          Lower values (e.g. 30 seconds) should be used if you can't use the discovery.
+          Lower values (e.g. 30 seconds) should be used if your network blocks the discovery unicast.
          Some relevant information can be found here:
          https://sourceforge.net/p/minidlna/discussion/879957/thread/1389d197/
        '';
@ -82,8 +79,8 @@ in
      };
      options.root_container = mkOption {
        type = types.str;
-        default = ".";
-        example = "B";
+        default = "B";
+        example = ".";
        description = lib.mdDoc "Use a different container as the root of the directory tree presented to clients.";
      };
      options.log_level = mkOption {
@ -133,22 +130,19 @@ in

    users.groups.minidlna.gid = config.ids.gids.minidlna;

-    systemd.services.minidlna =
-      { description = "MiniDLNA Server";
+    systemd.services.minidlna = {
+      description = "MiniDLNA Server";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];

-        wantedBy = [ "multi-user.target" ];
-        after = [ "network.target" ];
-
-        serviceConfig =
-          { User = "minidlna";
-            Group = "minidlna";
-            CacheDirectory = "minidlna";
-            RuntimeDirectory = "minidlna";
-            PIDFile = "/run/minidlna/pid";
-            ExecStart =
-              "${pkgs.minidlna}/sbin/minidlnad -S -P /run/minidlna/pid" +
-              " -f ${settingsFile}";
-          };
+      serviceConfig = {
+        User = "minidlna";
+        Group = "minidlna";
+        CacheDirectory = "minidlna";
+        RuntimeDirectory = "minidlna";
+        PIDFile = "/run/minidlna/pid";
+        ExecStart = "${pkgs.minidlna}/sbin/minidlnad -S -P /run/minidlna/pid -f ${settingsFile}";
      };
+    };
  };
 }
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@ -90,8 +90,8 @@ in

    phononBackend = mkOption {
      type = types.enum [ "gstreamer" "vlc" ];
-      default = "gstreamer";
-      example = "vlc";
+      default = "vlc";
+      example = "gstreamer";
      description = lib.mdDoc "Phonon audio backend to install.";
    };

--- a/pkgs/applications/emulators/ppsspp/default.nix
+++ b/pkgs/applications/emulators/ppsspp/default.nix
@ -7,17 +7,15 @@
 , ffmpeg
 , glew
 , libffi
+, libsForQt5
 , libzip
 , makeDesktopItem
 , makeWrapper
 , pkg-config
 , python3
-, qtbase
-, qtmultimedia
 , snappy
 , vulkan-loader
 , wayland
-, wrapQtAppsHook
 , zlib
 , enableQt ? false
 , enableVulkan ? true
@ -27,6 +25,7 @@
 let
  # experimental, see https://github.com/hrydgard/ppsspp/issues/13845
  vulkanWayland = enableVulkan && forceWayland;
+  inherit (libsForQt5) qtbase qtmultimedia wrapQtAppsHook;
 in
 # Only SDL frontend needs to specify whether to use Wayland
 assert forceWayland -> !enableQt;
--- a/pkgs/applications/file-managers/vifm/default.nix
+++ b/pkgs/applications/file-managers/vifm/default.nix
@ -1,4 +1,5 @@
 { stdenv, fetchurl, makeWrapper
+, perl # used to generate help tags
 , pkg-config
 , ncurses, libX11
 , util-linux, file, which, groff
@ -17,9 +18,14 @@ in stdenv.mkDerivation rec {
    sha256 = "sha256-j+KBPr3Mz+ma7OArBdYqIJkVJdRrDM+67Dr2FMZlVog=";
  };

-  nativeBuildInputs = [ pkg-config makeWrapper ];
+  nativeBuildInputs = [ perl pkg-config makeWrapper ];
  buildInputs = [ ncurses libX11 util-linux file which groff ];

+  postPatch = ''
+    # Avoid '#!/usr/bin/env perl' reverences to build help.
+    patchShebangs --build src/helpztags
+  '';
+
  postFixup = let
    path = lib.makeBinPath
      [ udisks2
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@ -1,29 +1,66 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, pixman, libpthreadstubs, gtkmm3, libXau
-, libXdmcp, lcms2, libiptcdata, libcanberra-gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook
-, lensfun, librsvg, gtk-mac-integration
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, wrapGAppsHook
+, makeWrapper
+, pixman
+, libpthreadstubs
+, gtkmm3
+, libXau
+, libXdmcp
+, lcms2
+, libiptcdata
+, fftw
+, expat
+, pcre
+, libsigcxx
+, lensfun
+, librsvg
+, libcanberra-gtk3
+, gtk-mac-integration
 }:

 stdenv.mkDerivation rec {
-  version = "5.8";
  pname = "rawtherapee";
+  version = "5.9";

  src = fetchFromGitHub {
    owner = "Beep6581";
    repo = "RawTherapee";
    rev = version;
-    sha256 = "0d644s4grfia6f3k6y0byd5pwajr12kai2kc280yxi8v3w1b12ik";
+    hash = "sha256-kdctfjss/DHEcaSDPXcmT20wXTwkI8moRX/i/5wT5Hg=";
  };

-  nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ];
+  postPatch = ''
+    echo "set(HG_VERSION ${version})" > ReleaseInfo.cmake
+    substituteInPlace tools/osx/Info.plist.in rtgui/config.h.in \
+      --replace "/Applications" "${placeholder "out"}/Applications"
+  '';

-  # This patch is upstream; remove it in 5.9.
-  patches = [ ./fix-6324.patch ]
-  # Disable upstream-enforced bundling on macOS.
-  ++ lib.optionals stdenv.isDarwin [ ./do-not-bundle.patch ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wrapGAppsHook
+  ] ++ lib.optionals stdenv.isDarwin [
+    makeWrapper
+  ];

  buildInputs = [
-    pixman libpthreadstubs gtkmm3 libXau libXdmcp
-    lcms2 libiptcdata fftw expat pcre libsigcxx lensfun librsvg
+    pixman
+    libpthreadstubs
+    gtkmm3
+    libXau
+    libXdmcp
+    lcms2
+    libiptcdata
+    fftw
+    expat
+    pcre
+    libsigcxx
+    lensfun
+    librsvg
  ] ++ lib.optionals stdenv.isLinux [
    libcanberra-gtk3
  ] ++ lib.optionals stdenv.isDarwin [
@ -33,12 +70,22 @@ stdenv.mkDerivation rec {
  cmakeFlags = [
    "-DPROC_TARGET_NUMBER=2"
    "-DCACHE_NAME_SUFFIX=\"\""
+  ] ++ lib.optionals stdenv.isDarwin [
+    "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}"
  ];

-  CMAKE_CXX_FLAGS = "-std=c++11 -Wno-deprecated-declarations -Wno-unused-result";
+  CMAKE_CXX_FLAGS = toString [
+    "-std=c++11"
+    "-Wno-deprecated-declarations"
+    "-Wno-unused-result"
+  ];

-  postUnpack = ''
-    echo "set(HG_VERSION $version)" > $sourceRoot/ReleaseInfo.cmake
+  postInstall = lib.optionalString stdenv.isDarwin ''
+    mkdir -p $out/Applications/RawTherapee.app $out/bin
+    cp -R Release $out/Applications/RawTherapee.app/Contents
+    for f in $out/Applications/RawTherapee.app/Contents/MacOS/*; do
+      makeWrapper $f $out/bin/$(basename $f)
+    done
  '';

  meta = {
--- a/pkgs/applications/graphics/rawtherapee/do-not-bundle.patch
+++ b/pkgs/applications/graphics/rawtherapee/do-not-bundle.patch
@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0a55ca6d5..68c059aa5 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -233,6 +233,6 @@ if(WIN32 OR APPLE)
-     endif()
-    set(BUILD_BUNDLE ON FORCE)
-+    set(BUILD_BUNDLE OFF)
- endif()
- 
- if(NOT DEFINED BUNDLE_BASE_INSTALL_DIR)
-    if(APPLE)
-+    if(FALSE)
--- a/pkgs/applications/graphics/rawtherapee/fix-6324.patch
+++ b/pkgs/applications/graphics/rawtherapee/fix-6324.patch
@ -1,356 +0,0 @@
-See:
-  https://github.com/Beep6581/RawTherapee/issues/6324
-  https://github.com/Beep6581/RawTherapee/commit/2e0137d54243eb729d4a5f939c4320ec8f8f415d
-
-diff --git a/rtengine/canon_cr3_decoder.cc b/rtengine/canon_cr3_decoder.cc
-index 6274154cb..98c743dad 100644
--- a/rtengine/canon_cr3_decoder.cc
-+++ b/rtengine/canon_cr3_decoder.cc
-@@ -662,7 +662,7 @@ std::uint32_t _byteswap_ulong(std::uint32_t x)
- #endif
- 
- struct LibRaw_abstract_datastream {
-    IMFILE* ifp;
-+    rtengine::IMFILE* ifp;
- 
-     void lock()
-     {
-diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc
-index 812f122b3..5da696af2 100644
--- a/rtengine/dcraw.cc
-+++ b/rtengine/dcraw.cc
-@@ -2025,7 +2025,7 @@ void CLASS phase_one_load_raw_c()
- #endif
- {
-     int len[2], pred[2];
-    IMFILE ifpthr = *ifp;
-+    rtengine::IMFILE ifpthr = *ifp;
-     ifpthr.plistener = nullptr;
- 
- #ifdef _OPENMP
-@@ -3380,7 +3380,7 @@ void CLASS sony_arw2_load_raw()
- {
-     uchar *data = new (std::nothrow) uchar[raw_width + 1];
-     merror(data, "sony_arw2_load_raw()");
-    IMFILE ifpthr = *ifp;
-+    rtengine::IMFILE ifpthr = *ifp;
-     int pos = ifpthr.pos;
-     ushort pix[16];
- 
-@@ -6394,7 +6394,7 @@ int CLASS parse_tiff_ifd (int base)
-   unsigned sony_curve[] = { 0,0,0,0,0,4095 };
-   unsigned *buf, sony_offset=0, sony_length=0, sony_key=0;
-   struct jhead jh;
-/*RT*/  IMFILE *sfp;
-+/*RT*/  rtengine::IMFILE *sfp;
- /*RT*/  int pana_raw = 0;
- 
-   if (tiff_nifds >= sizeof tiff_ifd / sizeof tiff_ifd[0])
-@@ -6958,7 +6958,7 @@ it under the terms of the one of two licenses as you choose:
-     fread (buf, sony_length, 1, ifp);
-     sony_decrypt (buf, sony_length/4, 1, sony_key);
-     sfp = ifp;
-/*RT*/ ifp = fopen (buf, sony_length);
-+/*RT*/ ifp = rtengine::fopen (buf, sony_length);
- // if ((ifp = tmpfile())) {
- // fwrite (buf, sony_length, 1, ifp);
- // fseek (ifp, 0, SEEK_SET);
-@@ -7264,7 +7264,7 @@ void CLASS parse_external_jpeg()
- {
-   const char *file, *ext;
-   char *jname, *jfile, *jext;
-/*RT*/  IMFILE *save=ifp;
-+/*RT*/  rtengine::IMFILE *save=ifp;
- 
-   ext  = strrchr (ifname, '.');
-   file = strrchr (ifname, '/');
-@@ -7292,7 +7292,7 @@ void CLASS parse_external_jpeg()
-       *jext = '0';
-     }
-   if (strcmp (jname, ifname)) {
-/*RT*/    if ((ifp = fopen (jname))) {
-+/*RT*/    if ((ifp = rtengine::fopen (jname))) {
- //    if ((ifp = fopen (jname, "rb"))) {
-       if (verbose)
- 	fprintf (stderr,_("Reading metadata from %s ...\n"), jname);
-diff --git a/rtengine/dcraw.h b/rtengine/dcraw.h
-index 89c1fcaff..f25157088 100644
--- a/rtengine/dcraw.h
-+++ b/rtengine/dcraw.h
-@@ -73,7 +73,7 @@ public:
- 
- protected:
-     int exif_base, ciff_base, ciff_len;
-    IMFILE *ifp;
-+    rtengine::IMFILE *ifp;
-     FILE *ofp;
-     short order;
-     const char *ifname;
-@@ -125,7 +125,7 @@ protected:
-         int         cur_buf_size;    // buffer size
-         uchar       *cur_buf;        // currently read block
-         int         fillbytes;          // Counter to add extra byte for block size N*16
-        IMFILE      *input;
-+        rtengine::IMFILE      *input;
-         struct int_pair grad_even[3][41];    // tables of gradients
-         struct int_pair grad_odd[3][41];
-         ushort		*linealloc;
-@@ -278,7 +278,7 @@ void parse_redcine();
- class getbithuff_t
- {
- public:
-   getbithuff_t(DCraw *p,IMFILE *&i, unsigned &z):parent(p),bitbuf(0),vbits(0),reset(0),ifp(i),zero_after_ff(z){}
-+   getbithuff_t(DCraw *p,rtengine::IMFILE *&i, unsigned &z):parent(p),bitbuf(0),vbits(0),reset(0),ifp(i),zero_after_ff(z){}
-    unsigned operator()(int nbits, ushort *huff);
- 
- private:
-@@ -288,7 +288,7 @@ private:
-    DCraw *parent;
-    unsigned bitbuf;
-    int vbits, reset;
-   IMFILE *&ifp;
-+   rtengine::IMFILE *&ifp;
-    unsigned &zero_after_ff;
- };
- getbithuff_t getbithuff;
-@@ -296,7 +296,7 @@ getbithuff_t getbithuff;
- class nikbithuff_t
- {
- public:
-   explicit nikbithuff_t(IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){}
-+   explicit nikbithuff_t(rtengine::IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){}
-    void operator()() {bitbuf = vbits = 0;};
-    unsigned operator()(int nbits, ushort *huff);
-    unsigned errorCount() { return errors; }
-@@ -309,7 +309,7 @@ private:
-    }
-    unsigned bitbuf, errors;
-    int vbits;
-   IMFILE *&ifp;
-+   rtengine::IMFILE *&ifp;
- };
- nikbithuff_t nikbithuff;
- 
-@@ -378,7 +378,7 @@ void parse_qt (int end);
- // ph1_bithuff(int nbits, ushort *huff);
- class ph1_bithuff_t {
- public:
-   ph1_bithuff_t(DCraw *p, IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){}
-+   ph1_bithuff_t(DCraw *p, rtengine::IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){}
-    unsigned operator()(int nbits, ushort *huff);
-    unsigned operator()(int nbits);
-    unsigned operator()();
-@@ -412,7 +412,7 @@ private:
-    }
- 
-    short &order;
-   IMFILE* const ifp;
-+   rtengine::IMFILE* const ifp;
-    UINT64 bitbuf;
-    int vbits;
- };
-@@ -430,11 +430,11 @@ void nokia_load_raw();
- 
- class pana_bits_t{
- public:
-   pana_bits_t(IMFILE *i, unsigned &u, unsigned enc):
-+   pana_bits_t(rtengine::IMFILE *i, unsigned &u, unsigned enc):
-     ifp(i), load_flags(u), vbits(0), encoding(enc) {}
-    unsigned operator()(int nbits, unsigned *bytes=nullptr);
- private:
-   IMFILE *ifp;
-+   rtengine::IMFILE *ifp;
-    unsigned &load_flags;
-    uchar buf[0x4000];
-    int vbits;
-diff --git a/rtengine/dfmanager.cc b/rtengine/dfmanager.cc
-index 1fb1d2e1b..951df2248 100644
--- a/rtengine/dfmanager.cc
-+++ b/rtengine/dfmanager.cc
-@@ -540,7 +540,7 @@ std::vector<badPix> *DFManager::getHotPixels ( const std::string &mak, const std
- 
- int DFManager::scanBadPixelsFile( Glib::ustring filename )
- {
-    FILE *file = fopen( filename.c_str(), "r" );
-+    FILE *file = ::fopen( filename.c_str(), "r" );
- 
-     if( !file ) {
-         return false;
-diff --git a/rtengine/myfile.cc b/rtengine/myfile.cc
-index 842766dcf..2321d18bb 100644
--- a/rtengine/myfile.cc
-+++ b/rtengine/myfile.cc
-@@ -70,7 +70,7 @@ int munmap(void *start, size_t length)
- 
- #ifdef MYFILE_MMAP
- 
-IMFILE* fopen (const char* fname)
-+rtengine::IMFILE* rtengine::fopen (const char* fname)
- {
-     int fd;
- 
-@@ -123,13 +123,13 @@ IMFILE* fopen (const char* fname)
-     return mf;
- }
- 
-IMFILE* gfopen (const char* fname)
-+rtengine::IMFILE* rtengine::gfopen (const char* fname)
- {
-     return fopen(fname);
- }
- #else
- 
-IMFILE* fopen (const char* fname)
-+rtengine::IMFILE* rtengine::fopen (const char* fname)
- {
- 
-     FILE* f = g_fopen (fname, "rb");
-@@ -152,7 +152,7 @@ IMFILE* fopen (const char* fname)
-     return mf;
- }
- 
-IMFILE* gfopen (const char* fname)
-+rtengine::IMFILE* rtengine::gfopen (const char* fname)
- {
- 
-     FILE* f = g_fopen (fname, "rb");
-@@ -176,7 +176,7 @@ IMFILE* gfopen (const char* fname)
- }
- #endif //MYFILE_MMAP
- 
-IMFILE* fopen (unsigned* buf, int size)
-+rtengine::IMFILE* rtengine::fopen (unsigned* buf, int size)
- {
- 
-     IMFILE* mf = new IMFILE;
-@@ -190,7 +190,7 @@ IMFILE* fopen (unsigned* buf, int size)
-     return mf;
- }
- 
-void fclose (IMFILE* f)
-+void rtengine::fclose (IMFILE* f)
- {
- #ifdef MYFILE_MMAP
- 
-@@ -207,7 +207,7 @@ void fclose (IMFILE* f)
-     delete f;
- }
- 
-int fscanf (IMFILE* f, const char* s ...)
-+int rtengine::fscanf (IMFILE* f, const char* s ...)
- {
-     // fscanf not easily wrapped since we have no terminating \0 at end
-     // of file data and vsscanf() won't tell us how many characters that
-@@ -253,7 +253,7 @@ int fscanf (IMFILE* f, const char* s ...)
- }
- 
- 
-char* fgets (char* s, int n, IMFILE* f)
-+char* rtengine::fgets (char* s, int n, IMFILE* f)
- {
- 
-     if (f->pos >= f->size) {
-@@ -270,7 +270,7 @@ char* fgets (char* s, int n, IMFILE* f)
-     return s;
- }
- 
-void imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, double progress_range)
-+void rtengine::imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, double progress_range)
- {
-     f->plistener = plistener;
-     f->progress_range = progress_range;
-@@ -278,7 +278,7 @@ void imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, doub
-     f->progress_current = 0;
- }
- 
-void imfile_update_progress(IMFILE *f)
-+void rtengine::imfile_update_progress(IMFILE *f)
- {
-     if (!f->plistener || f->progress_current < f->progress_next) {
-         return;
-diff --git a/rtengine/myfile.h b/rtengine/myfile.h
-index 423edea9a..c655696e6 100644
--- a/rtengine/myfile.h
-+++ b/rtengine/myfile.h
-@@ -30,8 +30,6 @@ namespace rtengine
- 
- class ProgressListener;
- 
-}
-
- struct IMFILE {
-     int fd;
-     ssize_t pos;
-@@ -141,3 +139,5 @@ inline unsigned char* fdata(int offset, IMFILE* f)
- 
- int fscanf (IMFILE* f, const char* s ...);
- char* fgets (char* s, int n, IMFILE* f);
-+
-+}
-diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc
-index 9da601e2a..097b9e711 100644
--- a/rtengine/rtthumbnail.cc
-+++ b/rtengine/rtthumbnail.cc
-@@ -1922,7 +1922,7 @@ bool Thumbnail::writeImage (const Glib::ustring& fname)
- 
-     Glib::ustring fullFName = fname + ".rtti";
- 
-    FILE* f = g_fopen (fullFName.c_str (), "wb");
-+    FILE* f = ::g_fopen (fullFName.c_str (), "wb");
- 
-     if (!f) {
-         return false;
-@@ -1965,7 +1965,7 @@ bool Thumbnail::readImage (const Glib::ustring& fname)
-         return false;
-     }
- 
-    FILE* f = g_fopen(fullFName.c_str (), "rb");
-+    FILE* f = ::g_fopen(fullFName.c_str (), "rb");
- 
-     if (!f) {
-         return false;
-@@ -2191,7 +2191,7 @@ bool Thumbnail::writeData  (const Glib::ustring& fname)
-         return false;
-     }
- 
-    FILE *f = g_fopen (fname.c_str (), "wt");
-+    FILE *f = ::g_fopen (fname.c_str (), "wt");
- 
-     if (!f) {
-         if (settings->verbose) {
-@@ -2214,7 +2214,7 @@ bool Thumbnail::readEmbProfile  (const Glib::ustring& fname)
-     embProfile = nullptr;
-     embProfileLength = 0;
- 
-    FILE* f = g_fopen (fname.c_str (), "rb");
-+    FILE* f = ::g_fopen (fname.c_str (), "rb");
- 
-     if (f) {
-         if (!fseek (f, 0, SEEK_END)) {
-@@ -2242,7 +2242,7 @@ bool Thumbnail::writeEmbProfile (const Glib::ustring& fname)
- {
- 
-     if (embProfileData) {
-        FILE* f = g_fopen (fname.c_str (), "wb");
-+        FILE* f = ::g_fopen (fname.c_str (), "wb");
- 
-         if (f) {
-             fwrite (embProfileData, 1, embProfileLength, f);
-@@ -2257,7 +2257,7 @@ bool Thumbnail::writeEmbProfile (const Glib::ustring& fname)
- bool Thumbnail::readAEHistogram  (const Glib::ustring& fname)
- {
- 
-    FILE* f = g_fopen(fname.c_str(), "rb");
-+    FILE* f = ::g_fopen(fname.c_str(), "rb");
- 
-     if (!f) {
-         aeHistogram.reset();
-@@ -2280,7 +2280,7 @@ bool Thumbnail::writeAEHistogram (const Glib::ustring& fname)
- {
- 
-     if (aeHistogram) {
-        FILE* f = g_fopen (fname.c_str (), "wb");
-+        FILE* f = ::g_fopen (fname.c_str (), "wb");
- 
-         if (f) {
-             fwrite (&aeHistogram[0], 1, (65536 >> aeHistCompression)*sizeof (aeHistogram[0]), f);
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@ -51,11 +51,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "opera";
-  version = "94.0.4606.54";
+  version = "95.0.4635.37";

  src = fetchurl {
    url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
-    hash = "sha256-IMWIkJHKaE7n5Rll4ZExE6PQB9a2fz0hLx4vckbROgk=";
+    hash = "sha256-NQv9EVaBPfHygr76neYGACuk8A6Oc1GXAgizMa+jngw=";
  };

  unpackPhase = "dpkg-deb -x $src .";
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "cloudflared";
-  version = "2022.12.1";
+  version = "2023.2.1";

  src = fetchFromGitHub {
    owner = "cloudflare";
    repo = "cloudflared";
    rev = version;
-    hash = "sha256-FXN/UUlzG3+AYYZeKJ6XUG4rD3cPWIx22h3zZpvZhiM=";
+    hash = "sha256-vhcz/uk1sBt7XytXQYcPreoPfNz7fdPVE+j+FTH7tPc=";
  };

  vendorSha256 = null;
@ -56,6 +56,11 @@ buildGoModule rec {
    #   Expected nil, but got: Could not lookup srv records on _us-v2-origintunneld._tcp.argotunnel.com: lookup _us-v2-origintunneld._tcp.argotunnel.com on [::1]:53: read udp [::1]:49342->[::1]:53: read: connection refused
    substituteInPlace "supervisor/supervisor_test.go" \
      --replace "Test_Initialize_Same_Protocol" "Skip_Initialize_Same_Protocol"
+
+    # Workaround for: manager_test.go:197:
+    #   Should be false
+    substituteInPlace "datagramsession/manager_test.go" \
+      --replace "TestManagerCtxDoneCloseSessions" "SkipManagerCtxDoneCloseSessions"
  '';

  doCheck = !stdenv.isDarwin;
--- 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-CdG7StgMUr6FjC4YJKIfQlWqjvgnvzyGh8zKQ+DUJzU=",
+    "hash": "sha256-gAIZQIljgrYNtaDrPqWnd7K0rQkKz67hQWJyVgs4ZNs=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/aws",
    "owner": "hashicorp",
    "repo": "terraform-provider-aws",
-    "rev": "v4.53.0",
+    "rev": "v4.54.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-rnOrA3QYLZAU+VCm6OVLrnJ37Vcp6xzq0N8ohjWDl3Q="
+    "vendorHash": "sha256-9YvQP1QWnT2Rb9D65j6g2edxTDaoGisVlQWFNnH4lSs="
  },
  "azuread": {
    "hash": "sha256-Byr6AJ1kP6fBxBCD8vLxQD5tz8fI3Z1fcCa0rXS9rhs=",
@ -128,11 +128,11 @@
    "vendorHash": null
  },
  "azurerm": {
-    "hash": "sha256-eZwQsvIXYwpx/uLJKmYnNaOFWBue1ADeyhVbvl3fAy0=",
+    "hash": "sha256-b2KEq7QBpPR7100VCFIe9KGMm8Soy2wr/TAbUT0NxEQ=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
    "owner": "hashicorp",
    "repo": "terraform-provider-azurerm",
-    "rev": "v3.42.0",
+    "rev": "v3.43.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@ -283,13 +283,13 @@
    "vendorHash": "sha256-QlmVrcC1ctjAHOd7qsqc9gpqttKplEy4hlT++cFUZfM="
  },
  "datadog": {
-    "hash": "sha256-LZYpKwcNvkmpYfhCuZhxfid42IBhRmzfiHZVYu3XAlA=",
+    "hash": "sha256-gZdjbW2yz3TmnGfCLiveUpTcMeKBUUSV6CnugnkdoZ8=",
    "homepage": "https://registry.terraform.io/providers/DataDog/datadog",
    "owner": "DataDog",
    "repo": "terraform-provider-datadog",
-    "rev": "v3.20.0",
+    "rev": "v3.21.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-IrSQEu3IDFKM9t+3pkygyrrq8KRI8E0BqTui2TR5nFM="
+    "vendorHash": "sha256-6aBwtm4p/sJyH9jT7wT+utHIlOSgOilOk0AZSI9RzD8="
  },
  "dhall": {
    "hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=",
@ -857,13 +857,13 @@
    "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY="
  },
  "opentelekomcloud": {
-    "hash": "sha256-D2RPpG1RE+bM7rVvmItczpRExMXK0RaKfJsnifvXRTs=",
+    "hash": "sha256-/e/cfesAKYiAvhiXm7SYmpM5O8Rm/qHE8XnCS0m4lNQ=",
    "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
    "owner": "opentelekomcloud",
    "repo": "terraform-provider-opentelekomcloud",
-    "rev": "v1.32.3",
+    "rev": "v1.33.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-49ViIxICpvWgpv+uY0NTDvXGJthjH6aT38COfS+AOaQ="
+    "vendorHash": "sha256-GFpDNFn14aAqpBesICGS9AuKpxAe/UwRzTeWP4MReTU="
  },
  "opsgenie": {
    "hash": "sha256-Wbe+DyK5wKuZZX8yd3DJN+2wT8KZt+YsBwJYKnZnfcI=",
@ -875,20 +875,20 @@
    "vendorHash": null
  },
  "ovh": {
-    "hash": "sha256-LcSrs4FUrtp/4tp1xlBPKkfQ3J8FlZ/peL9NcC7XQy4=",
+    "hash": "sha256-xims3nYFVSS38FIMJhUhtK7lKpnRzzlojYZY6t57owA=",
    "homepage": "https://registry.terraform.io/providers/ovh/ovh",
    "owner": "ovh",
    "repo": "terraform-provider-ovh",
-    "rev": "v0.26.0",
+    "rev": "v0.27.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
  "pagerduty": {
-    "hash": "sha256-utbV/EVSYIln0ruf4qis9rbKifx/DUct3tDOTUO22N0=",
+    "hash": "sha256-oD8YytttqaZwYk8/c5t7TvFpxw3QViZpkHiOpuMxaFI=",
    "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
    "owner": "PagerDuty",
    "repo": "terraform-provider-pagerduty",
-    "rev": "v2.9.3",
+    "rev": "v2.10.2",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@ -75,7 +75,7 @@ let
 in
 env.mkDerivation rec {
  pname = "telegram-desktop";
-  version = "4.6.1";
+  version = "4.6.2";
  # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py

  # Telegram-Desktop with submodules
@ -84,7 +84,7 @@ env.mkDerivation rec {
    repo = "tdesktop";
    rev = "v${version}";
    fetchSubmodules = true;
-    sha256 = "1df9rx3a6xvgipgzn5h4jc46nsdkypl4255si606bkrccdz8bcrl";
+    sha256 = "0lrflhnlsajay8gbz1x91fqk2ckxwpqmm19hyjfqxkvi56nl7a0g";
  };

  postPatch = ''
--- a/pkgs/applications/office/qownnotes/default.nix
+++ b/pkgs/applications/office/qownnotes/default.nix
@ -17,14 +17,14 @@
 let
  pname = "qownnotes";
  appname = "QOwnNotes";
-  version = "23.1.2";
+  version = "23.2.0";
 in
 stdenv.mkDerivation {
  inherit pname appname version;

  src = fetchurl {
    url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
-    sha256 = "sha256-yfsptsatmi0A+qLKHxchaLuu0WkJnUk7sjs1Pb/D6NU=";
+    sha256 = "sha256-S5m78E1wrWBu/bMmNUmv/ZprebyYPC9NDfINU2C/i8w=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@ -10,24 +10,24 @@ with lib;

 let
  pname = "gitkraken";
-  version = "9.0.0";
+  version = "9.1.0";

  throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";

  srcs = {
    x86_64-linux = fetchzip {
      url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
-      sha256 = "sha256-I6iIg+RBTz5HyommAvDuQBBURjMm04t31o5OZNCrYGc=";
+      sha256 = "sha256-HRd2jfTbdFKVMbnD4CzMsE22urExGrpf8rgli3dqVUY=";
    };

    x86_64-darwin = fetchzip {
      url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
-      sha256 = "1dhswjzyjrfz4psjji53fjpvb8845lv44qqc6ncfv1ljx9ky828r";
+      sha256 = "sha256-zJEjJ+l0/S8B2b7mlDd2sln8GsvCaZZIcarC45rLATQ=";
    };

    aarch64-darwin = fetchzip {
      url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
-      sha256 = "0jzcwx1z240rr08qc6vbasn51bcadz2jl3vm3jwgjpfdwypnsvk1";
+      sha256 = "sha256-5wep4FDNZwNOK05tm24132JuyBWUJRyeRpJDF7PLYoQ=";
    };
  };

--- a/pkgs/applications/version-management/sublime-merge/default.nix
+++ b/pkgs/applications/version-management/sublime-merge/default.nix
@ -4,8 +4,8 @@ let
  common = opts: callPackage (import ./common.nix opts);
 in {
  sublime-merge = common {
-    buildVersion = "2079";
-    x64sha256 = "y4ocLXxxEkGaw9O/vhX9MJnc56QgK37YPJkUwK2YS0U=";
+    buildVersion = "2083";
+    x64sha256 = "bWHbP8j228jUDr1XDLRciq7hcET6o6Udr/lLODXRudc=";
  } {};

  sublime-merge-dev = common {
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@ -50,13 +50,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "obs-studio";
-  version = "29.0.0";
+  version = "29.0.2";

  src = fetchFromGitHub {
    owner = "obsproject";
    repo = "obs-studio";
    rev = version;
-    sha256 = "sha256-c+G02k4AACaYfa5Zhsanr6AU3vNbopDMcYtuny/d25Y=";
+    sha256 = "sha256-TIUSjyPEsKRNTSLQXuLJGEgD989hJ5GhOsqJ4nkKVsY=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/virtualization/libgovirt/auto-disable-incompatible-compiler-warnings.patch
+++ b/pkgs/applications/virtualization/libgovirt/auto-disable-incompatible-compiler-warnings.patch
@ -0,0 +1,12 @@
+diff --git a/meson.build b/meson.build
+index d5c3627..2bd692a 100644
+--- a/meson.build
+++ b/meson.build
+@@ -86,7 +86,7 @@ govirt_global_cflags = ['-std=c99',
+                         '-Woverride-init',
+                         '-Wno-unused-parameter']
+
+-foreach arg : govirt_global_cflags
+foreach arg : compiler.get_supported_arguments(govirt_global_cflags)
+   add_project_arguments(arg, language : 'c')
+ endforeach
--- a/pkgs/applications/virtualization/libgovirt/default.nix
+++ b/pkgs/applications/virtualization/libgovirt/default.nix
@ -1,46 +1,48 @@
 { lib
 , stdenv
-, fetchurl
-, glib
+, fetchzip
 , gnome
-, librest
-, libsoup
+, meson
 , pkg-config
 , gobject-introspection
+, ninja
+, glib
+, librest_1_0
 }:

 stdenv.mkDerivation rec {
  pname = "libgovirt";
-  version = "0.3.8";
+  version = "0.3.9";

  outputs = [ "out" "dev" ];

-  src = fetchurl {
+  src = fetchzip {
    url = "mirror://gnome/sources/libgovirt/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "HckYYikXa9+p8l/Y+oLAoFi2pgwcyAfHUH7IqTwPHfg=";
+    sha256 = "sha256-6RDuJTyaVYlO4Kq+niQyepom6xj1lqdBbyWL/VnZUdk=";
  };

-  patches = lib.optionals stdenv.isDarwin [
-    # The flag breaks the build on darwin and doesn't seem necessary
-    ./no-version-script-ld-flag.patch
+  patches = [
+    # https://gitlab.gnome.org/GNOME/libgovirt/-/issues/9
+    ./auto-disable-incompatible-compiler-warnings.patch
  ];
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (lib.concatStringsSep " " [
+    "-Wno-typedef-redefinition"
+    "-Wno-missing-field-initializers"
+    "-Wno-cast-align"
+  ]);

  nativeBuildInputs = [
+    meson
    pkg-config
    gobject-introspection
-  ];
-
-  buildInputs = [
-    libsoup
+    ninja
  ];

  propagatedBuildInputs = [
    glib
-    librest
+    librest_1_0
  ];

-  enableParallelBuilding = true;
-
  passthru = {
    updateScript = gnome.updateScript {
      packageName = pname;
--- a/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch
+++ b/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch
@ -1,14 +0,0 @@
--- a/govirt/Makefile.in
-+++ b/govirt/Makefile.in
-@@ -511,8 +511,7 @@
- libgovirt_la_LDFLAGS = \
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
- 	-export-dynamic						\
-	-no-undefined						\
-	-Wl,--version-script=$(srcdir)/govirt.sym
-+	-no-undefined
- 
- libgovirt_la_CFLAGS = \
- 	$(WARNINGFLAGS_C)
-
-Diff finished.  Fri Oct 28 10:36:38 2022
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@ -3,14 +3,20 @@
 , bash-completion
 , fetchurl
 , fetchpatch
-, gdbm ? null
+, gdbm
 , glib
 , gsettings-desktop-schemas
 , gtk-vnc
 , gtk3
 , intltool
-, libcap ? null
+, libcap
 , libgovirt
+  # Currently unsupported. According to upstream, libgovirt is for a very narrow
+  # use-case and we don't currently cover it in Nixpkgs. It's safe to disable.
+  # https://gitlab.com/virt-viewer/virt-viewer/-/issues/100#note_1265011223
+  # Can be enabled again once this is merged:
+  # https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/129
+, ovirtSupport ? false
 , libvirt
 , libvirt-glib
 , libxml2
@ -19,21 +25,13 @@
 , pkg-config
 , python3
 , shared-mime-info
-# https://gitlab.com/virt-viewer/virt-viewer/-/issues/88
-, spice-gtk_libsoup2 ? null
-, spice-protocol ? null
+, spice-gtk
+, spice-protocol
 , spiceSupport ? true
 , vte
 , wrapGAppsHook
 }:

-assert spiceSupport -> (
-  gdbm != null
-  && (stdenv.isLinux -> libcap != null)
-  && spice-gtk_libsoup2 != null
-  && spice-protocol != null
-);
-
 with lib;

 stdenv.mkDerivation rec {
@ -46,10 +44,10 @@ stdenv.mkDerivation rec {
  };

  patches = [
-    # Fix build with meson 0.61
-    # https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/117
+    # Fix build with meson 0.61. Should be fixed in the next release.
+    # https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/120
    (fetchpatch {
-      url = "https://gitlab.com/virt-viewer/virt-viewer/-/commit/ed19e51407bee53988878a6ebed4e7279d00b1a1.patch";
+      url = "https://gitlab.com/virt-viewer/virt-viewer/-/commit/98d9f202ef768f22ae21b5c43a080a1aa64a7107.patch";
      sha256 = "sha256-3AbnkbhWOh0aNjUkmVoSV/9jFQtvTllOr7plnkntb2o=";
    })
  ];
@ -71,21 +69,26 @@ stdenv.mkDerivation rec {
    gsettings-desktop-schemas
    gtk-vnc
    gtk3
-    libgovirt
    libvirt
    libvirt-glib
    libxml2
    vte
+  ] ++ optionals ovirtSupport [
+    libgovirt
  ] ++ optionals spiceSupport ([
    gdbm
-    spice-gtk_libsoup2
+    spice-gtk
    spice-protocol
  ] ++ optionals stdenv.isLinux [
    libcap
  ]);

  # Required for USB redirection PolicyKit rules file
-  propagatedUserEnvPkgs = optional spiceSupport spice-gtk_libsoup2;
+  propagatedUserEnvPkgs = optional spiceSupport spice-gtk;
+
+  mesonFlags = [
+    (lib.mesonEnable "ovirt" ovirtSupport)
+  ];

  strictDeps = true;

--- a/pkgs/data/fonts/sarasa-gothic/default.nix
+++ b/pkgs/data/fonts/sarasa-gothic/default.nix
@ -2,13 +2,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "sarasa-gothic";
-  version = "0.39.0";
+  version = "0.40.0";

  src = fetchurl {
    # Use the 'ttc' files here for a smaller closure size.
    # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
    url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
-    hash = "sha256-n21aVsyQbZGR/dgAkYwMHB8VozTaazFVP29+p39SRKU=";
+    hash = "sha256-i8W1PLFPXR7ftRt51LmKZEqc22ms7RGFW9cKMUsMRhk=";
  };

  sourceRoot = ".";
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@ -2,13 +2,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "numix-icon-theme-circle";
-  version = "23.01.29";
+  version = "23.02.05";

  src = fetchFromGitHub {
    owner = "numixproject";
    repo = pname;
    rev = version;
-    sha256 = "sha256-VmVzU8ACBE4Rx0uVScdQVbygDLE9MmD7ssD1j4ri74g=";
+    sha256 = "sha256-wS7GAfrzJ2/BvfoBZ7YR/X5j/ND4o7shf08dgk9GBkA=";
  };

  nativeBuildInputs = [ gtk3 ];
--- a/pkgs/desktops/gnome/apps/ghex/default.nix
+++ b/pkgs/desktops/gnome/apps/ghex/default.nix
@ -22,13 +22,13 @@

 stdenv.mkDerivation rec {
  pname = "ghex";
-  version = "43.0";
+  version = "43.1";

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

  src = fetchurl {
    url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "hmwGIsZv21rSpHXpz8zLIZocZDHwCayyKR1D8hQLFH4=";
+    sha256 = "pUuUPv5CAQqcEuTc2ts3e/NslMOAB3i4Uww6g0QJ3Mc=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/compilers/p4c/default.nix
+++ b/pkgs/development/compilers/p4c/default.nix
@ -27,13 +27,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "p4c";
-  version = "1.2.3.5";
+  version = "1.2.3.6";

  src = fetchFromGitHub {
    owner = "p4lang";
    repo = "p4c";
    rev = "v${version}";
-    sha256 = "sha256-5wDwHj+1X6HhhiLfEbOzijpZH6GwpTPEKgNh3iIGTWY=";
+    sha256 = "sha256-3i2L1wORVN+X5sr4Hs+zGD/GgM1sAXt34R4kGMkd4qk=";
    fetchSubmodules = true;
  };

--- a/pkgs/development/compilers/yosys/plugins/symbiflow.nix
+++ b/pkgs/development/compilers/yosys/plugins/symbiflow.nix
@ -15,11 +15,11 @@
  src = fetchFromGitHub {
    owner  = "chipsalliance";
    repo   = "yosys-f4pga-plugins";
-    rev    = "e23ff6db487da9ceea576c53ac33853566c3a84e";
-    hash   = "sha256-HJ4br6lQwRrcnkLgV3aecr3T3zcPzA11MfxhRjwIb0I=";
+    rev    = "08430ec4f53d1cf9d6a2091211d6c5ce501d5486";
+    hash   = "sha256-xCFi8OrNfsKt7bVSYJ/yuBify/pyCU1rI16gaCBgil8=";
  };

-  version = "2022.11.07";
+  version = "2023.02.08";

  # Supported symbiflow plugins.
  #
@ -79,13 +79,13 @@ in lib.genAttrs plugins (plugin: stdenv.mkDerivation (rec {
  ];

  buildFlags = [
-    "PLUGINS_DIR=\${out}/share/yosys/plugins/"
-    "DATA_DIR=\${out}/share/yosys/"
+    "YOSYS_PLUGINS_DIR=\${out}/share/yosys/plugins/"
+    "YOSYS_DATA_DIR=\${out}/share/yosys/"
  ];

  checkFlags = [
-    "PLUGINS_DIR=\${NIX_BUILD_TOP}/source/${plugin}-plugin"
-    "DATA_DIR=\${NIX_BUILD_TOP}/source/${plugin}-plugin"
+    "YOSYS_PLUGINS_DIR=\${NIX_BUILD_TOP}/source/${plugin}-plugin"
+    "YOSYS_DATA_DIR=\${NIX_BUILD_TOP}/source/${plugin}-plugin"
    ( "NIX_YOSYS_PLUGIN_DIRS=\${NIX_BUILD_TOP}/source/${plugin}-plugin"
      # sdc and xdc plugins use design introspection for their tests
      + (lib.optionalString ( plugin == "sdc" || plugin == "xdc" )
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@ -22,13 +22,13 @@

 stdenv.mkDerivation rec {
  pname = "folly";
-  version = "2023.01.30.00";
+  version = "2023.02.06.00";

  src = fetchFromGitHub {
    owner = "facebook";
    repo = "folly";
    rev = "v${version}";
-    sha256 = "sha256-p5IAbXPUrGtJotwabpEShNsUZNeF6ncHbDXaNabdaaY=";
+    sha256 = "sha256-37BoLs7LynuMuF7cdJtVOfZSs22PZr6DYNAVwigZghw=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/gtk-layer-shell/default.nix
+++ b/pkgs/development/libraries/gtk-layer-shell/default.nix
@ -1,11 +1,14 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchFromGitHub
+, fetchpatch
 , meson
 , ninja
 , pkg-config
 , gtk-doc
 , docbook-xsl-nons
 , docbook_xml_dtd_43
+, wayland-scanner
 , wayland
 , gtk3
 , gobject-introspection
@ -26,6 +29,27 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-Z7jPYLKgkwMNXu80aaZ2vNj57LbN+X2XqlTTq6l0wTE=";
  };

+  patches = [
+    # https://github.com/wmww/gtk-layer-shell/pull/146
+    # Mark wayland-scanner as a build-time dependency
+    (fetchpatch {
+      url = "https://github.com/wmww/gtk-layer-shell/commit/6fd16352e5b35fefc91aa44e73671addaaa95dfc.patch";
+      hash = "sha256-U/mxmcRcZnsF0fvWW0axo6ajqW40NuOzNIAzoLCboRM=";
+    })
+    # https://github.com/wmww/gtk-layer-shell/pull/147
+    # Remove redundant dependency check for gtk-doc
+    (fetchpatch {
+      url = "https://github.com/wmww/gtk-layer-shell/commit/124ccc2772d5ecbb40b54872c22e594c74bd39bc.patch";
+      hash = "sha256-WfrWe9UJCp1RvVJhURAxGw4jzqPjoaP6182jVdoEAQs=";
+    })
+  ];
+
+  strictDeps = true;
+
+  depsBuildBuild = [
+    pkg-config
+  ];
+
  nativeBuildInputs = [
    meson
    ninja
@ -35,6 +59,7 @@ stdenv.mkDerivation rec {
    docbook-xsl-nons
    docbook_xml_dtd_43
    vala
+    wayland-scanner
  ];

  buildInputs = [
@ -51,6 +76,6 @@ stdenv.mkDerivation rec {
    description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol";
    license = licenses.lgpl3Plus;
    maintainers = with maintainers; [ eonpatapon ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
  };
 }
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@ -36,13 +36,13 @@

 stdenv.mkDerivation rec {
  pname = "ogre";
-  version = "13.6.1";
+  version = "13.6.2";

  src = fetchFromGitHub {
    owner = "OGRECave";
    repo = "ogre";
    rev = "v${version}";
-    hash = "sha256-UG/vwLE80Ski9NwMj9E5+PoLU6rSCdJrSmQOmmFv66U=";
+    hash = "sha256-4Jmhseg1+4g0b8Pa8A4YL+ixYMe/HxzXrDaXUfElh+k=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/quictls/default.nix
+++ b/pkgs/development/libraries/quictls/default.nix
@ -12,13 +12,13 @@

 stdenv.mkDerivation rec {
  pname = "quictls";
-  version = "3.0.7+quic1";
+  version = "3.0.8+quic";

  src = fetchFromGitHub {
    owner = "quictls";
    repo = "openssl";
    rev = "openssl-${version}";
-    sha256 = "sha256-ZRS0ZV+/U4PD2lVE+PsUAWSuk5EFg5mOKYlwgY3Ecus=";
+    sha256 = "sha256-6t23EY+Gk/MvLOcYpDbL5jEr0rMaaPYOsc+12WFgv1c=";
  };

  patches = [
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchFromGitHub
 , fetchpatch
 , cmake
@ -8,7 +9,9 @@
 , snappy
 , zlib
 , zstd
-, enableJemalloc ? false, jemalloc
+, windows
+, enableJemalloc ? false
+, jemalloc
 , enableLite ? false
 , enableShared ? !stdenv.hostPlatform.isStatic
 , sse42Support ? stdenv.hostPlatform.sse4_2Support
@ -29,7 +32,8 @@ stdenv.mkDerivation rec {

  propagatedBuildInputs = [ bzip2 lz4 snappy zlib zstd ];

-  buildInputs = lib.optional enableJemalloc jemalloc;
+  buildInputs = lib.optional enableJemalloc jemalloc
+    ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64_pthreads;

  outputs = [
    "out"
@ -73,7 +77,7 @@ stdenv.mkDerivation rec {

  preInstall = ''
    mkdir -p $tools/bin
-    cp tools/{ldb,sst_dump} $tools/bin/
+    cp tools/{ldb,sst_dump}${stdenv.hostPlatform.extensions.executable} $tools/bin/
  '' + lib.optionalString stdenv.isDarwin ''
    ls -1 $tools/bin/* | xargs -I{} install_name_tool -change "@rpath/librocksdb.7.dylib" $out/lib/librocksdb.dylib {}
  '' + lib.optionalString (stdenv.isLinux && enableShared) ''
--- a/pkgs/development/mobile/maestro/default.nix
+++ b/pkgs/development/mobile/maestro/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "maestro";
-  version = "1.21.3";
+  version = "1.22.1";

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

  dontUnpack = true;
--- a/pkgs/development/python-modules/aesedb/default.nix
+++ b/pkgs/development/python-modules/aesedb/default.nix
@ -39,6 +39,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Parser for JET databases";
    homepage = "https://github.com/skelsec/aesedb";
+    changelog = "https://github.com/skelsec/aesedb/releases/tag/${version}";
    license = with licenses; [ mit ];
    maintainers = with maintainers; [ fab ];
  };
--- a/pkgs/development/python-modules/aiowinreg/default.nix
+++ b/pkgs/development/python-modules/aiowinreg/default.nix
@ -1,20 +1,23 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
+, prompt-toolkit
 , pythonOlder
 , winacl
-, prompt-toolkit
 }:

 buildPythonPackage rec {
  pname = "aiowinreg";
-  version = "0.0.7";
+  version = "0.0.8";
+  format = "setuptools";

  disabled = pythonOlder "3.6";

-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1p88q2b6slm1sw3234r40s9jd03fqlkcx8y3iwg6ihf0z4ww14d1";
+  src = fetchFromGitHub {
+    owner = "skelsec";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-4/xElE70rJKBMS1HdHb6BlcKs4gzNfuEo/6ahN6ixSM=";
  };

  propagatedBuildInputs = [
@ -25,11 +28,14 @@ buildPythonPackage rec {
  # Project doesn't have tests
  doCheck = false;

-  pythonImportsCheck = [ "aiowinreg" ];
+  pythonImportsCheck = [
+    "aiowinreg"
+  ];

  meta = with lib; {
    description = "Python module to parse the registry hive";
    homepage = "https://github.com/skelsec/aiowinreg";
+    changelog = "https://github.com/skelsec/aiowinreg/releases/tag/${version}";
    license = with licenses; [ mit ];
    maintainers = with maintainers; [ fab ];
  };
--- a/pkgs/development/python-modules/awscrt/default.nix
+++ b/pkgs/development/python-modules/awscrt/default.nix
@ -12,14 +12,14 @@

 buildPythonPackage rec {
  pname = "awscrt";
-  version = "0.16.8";
+  version = "0.16.10";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-26JjUlFLyNtm93/UkvEO+eV22ZHI1gxWecf2cuBifgE=";
+    hash = "sha256-MQFJm0ebgvBAP2Fb9SDB+LlQaBjSdePiit4lzGvNuSs=";
  };

  buildInputs = lib.optionals stdenv.isDarwin [
--- a/pkgs/development/python-modules/flax/default.nix
+++ b/pkgs/development/python-modules/flax/default.nix
@ -17,13 +17,13 @@

 buildPythonPackage rec {
  pname = "flax";
-  version = "0.6.3";
+  version = "0.6.1";

  src = fetchFromGitHub {
    owner = "google";
    repo = pname;
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-4BYfrwEddA2LCMyDO6PBBYdMVTqqDxhzMCZ5JIIml3g=";
+    sha256 = "sha256-fZiODo+izOwGjCCTvi11GvUG/VQL1DV9bNXKjvIIw4A=";
  };

  buildInputs = [ jaxlib ];
@ -87,8 +87,5 @@ buildPythonPackage rec {
    homepage = "https://github.com/google/flax";
    license = licenses.asl20;
    maintainers = with maintainers; [ ndl ];
-    # Py3.10 requires orbax, tensorstore which needs packaging
-    # Py3.11 requires tensorboard, which is unsupported at py3.11 atm
-    broken = true; # At 2023-02-05
  };
 }
--- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
@ -28,14 +28,14 @@

 buildPythonPackage rec {
  pname = "google-cloud-bigquery";
-  version = "3.4.2";
+  version = "3.5.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-Ik3DKbxa0J1hTbdlyV8LuLJPCIGz0qSFQGLKNG+IlvA=";
+    hash = "sha256-3TyoTlvm+p4FcPshZlqQLMVlHL0EWEL7cUFkyZomOcQ=";
  };

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

 buildPythonPackage rec {
  pname = "google-cloud-spanner";
-  version = "3.27.0";
+  version = "3.27.1";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-6zrAz+VqO8ojC+E0wcYMktZpnWF7skSj6R4GRrJ3nOs=";
+    hash = "sha256-1/pGE8Ql50B8hY4I/o5AhPIDOuE3EQcro2zMN23zLsc=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix
+++ b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix
@ -7,14 +7,14 @@

 buildPythonPackage rec {
  pname = "insteon-frontend-home-assistant";
-  version = "0.3.0";
+  version = "0.3.1";
  format = "pyproject";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-QaWRafp0901vQFMtlmFzkugNsM4PHRll+FUZlEz6E5g=";
+    hash = "sha256-gS2jDjgAcY4ve80yOPZcZR1v4c9EISYEoJkIezUQilU=";
  };

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

 buildPythonPackage rec {
  pname = "msgspec";
-  version = "0.12.0";
+  version = "0.13.0";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "jcrist";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-9k1lpx5pb9idMwgYAZjVEM915w5wsmLWQ/tnHNSKHAs=";
+    hash = "sha256-R3/ljUBm0WTRIdp5qoHtH3k1ReaMzASsD4tB8bHKAMc=";
  };

  # Requires libasan to be accessible
--- a/pkgs/development/python-modules/nextcord/default.nix
+++ b/pkgs/development/python-modules/nextcord/default.nix
@ -16,7 +16,7 @@

 buildPythonPackage rec {
  pname = "nextcord";
-  version = "2.3.2";
+  version = "2.3.3";

  format = "setuptools";

@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "nextcord";
    repo = "nextcord";
    rev = "refs/tags/v${version}";
-    hash = "sha256-ZflCOTqNhalBhxDkee3UwusiVA+ShtfabP0slE28/UQ=";
+    hash = "sha256-0ZWPoDLlGwLWReOeZc2GgW1FbUufrxTzUndNe5h7Kas=";
  };

  patches = [
@ -56,6 +56,7 @@ buildPythonPackage rec {
  ];

  meta = with lib; {
+    changelog = "https://github.com/nextcord/nextcord/blob/${src.rev}/docs/whats_new.rst";
    description = "Python wrapper for the Discord API forked from discord.py";
    homepage = "https://github.com/nextcord/nextcord";
    license = licenses.mit;
--- a/pkgs/development/python-modules/pytenable/default.nix
+++ b/pkgs/development/python-modules/pytenable/default.nix
@ -20,7 +20,7 @@

 buildPythonPackage rec {
  pname = "pytenable";
-  version = "1.4.11";
+  version = "1.4.12";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -29,7 +29,7 @@ buildPythonPackage rec {
    owner = "tenable";
    repo = "pyTenable";
    rev = "refs/tags/${version}";
-    hash = "sha256-GSEMjgG8Q+gzHQWRbXr/qiGP6U6ydPxu0JsD56mRNWU=";
+    hash = "sha256-vuwD9NVomxwG1IQioy6TzEHnibCdpg+VyCXjnjnmw54=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "reolink-aio";
-  version = "0.3.4";
+  version = "0.4.0";
  format = "setuptools";

  disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "starkillerOG";
    repo = "reolink_aio";
    rev = "refs/tags/${version}";
-    hash = "sha256-Z1dhaGMbbg4xflJGcC6cZKCvTfB8+jDbgShMzI6T/xk=";
+    hash = "sha256-fMB71fUMtckXiwCXaDHy3jmh0MsdKtamatEL+gYSdXA=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/torch/binary-hashes.nix
+++ b/pkgs/development/python-modules/torch/binary-hashes.nix
@ -9,23 +9,23 @@ version : builtins.getAttr version {
  "1.13.1" = {
    x86_64-linux-37 = {
      name = "torch-1.13.1-cp37-cp37m-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu116/torch-1.13.1%2Bcu116-cp37-cp37m-linux_x86_64.whl";
-      hash = "sha256-INfG4AgEtr6m9pt3JAxPzfJEzOL2sf9zvv98DfZVPZ0=";
+      url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp37-cp37m-linux_x86_64.whl";
+      hash = "sha256-bXg6H3mHFyTK2jw3TKUJiGNZqMSseNBT34mxQu6QREA=";
    };
    x86_64-linux-38 = {
      name = "torch-1.13.1-cp38-cp38-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu116/torch-1.13.1%2Bcu116-cp38-cp38-linux_x86_64.whl";
-      hash = "sha256-kzj6oKWg62JeF+OXKfBvsKV0CY16uI2Fa72ky3agtmU=";
+      url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp38-cp38-linux_x86_64.whl";
+      hash = "sha256-u/lUbw0Ni1EmPKR5Y3tCaogzX8oANPQs7GPU0y3uBa8=";
    };
    x86_64-linux-39 = {
      name = "torch-1.13.1-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu116/torch-1.13.1%2Bcu116-cp39-cp39-linux_x86_64.whl";
-      hash = "sha256-20V6gi1zYBO2/+UJBTABvJGL3Xj+aJZ7YF9TmEqa+sU=";
+      url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp39-cp39-linux_x86_64.whl";
+      hash = "sha256-s6wTng1KCzA8wW9R63cUbsfRTAsecCrWOGE2KPUIavc=";
    };
    x86_64-linux-310 = {
      name = "torch-1.13.1-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu116/torch-1.13.1%2Bcu116-cp310-cp310-linux_x86_64.whl";
-      hash = "sha256-UdWHDN8FtiCLHHOf4LpRG5d+yjf5UHgpZ1WWrMEbbKQ=";
+      url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp310-cp310-linux_x86_64.whl";
+      hash = "sha256-FMXJ2wnfjPGzlCo0ecd52m4pOoShYtimrHHiveMOMMU=";
    };
    x86_64-darwin-37 = {
      name = "torch-1.13.1-cp37-none-macosx_10_9_x86_64.whl";
@ -62,6 +62,5 @@ version : builtins.getAttr version {
      url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp310-none-macosx_11_0_arm64.whl";
      hash = "sha256-ASKAaxEblJ0h+hpfl2TR/S/MSkfLf4/5FCBP1Px1LtU=";
    };
-
  };
 }
--- a/pkgs/development/python-modules/torch/prefetch.sh
+++ b/pkgs/development/python-modules/torch/prefetch.sh
@ -5,7 +5,7 @@ set -eou pipefail

 version=$1

-linux_cuda_version="cu116"
+linux_cuda_version="cu117"
 linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
 darwin_bucket="https://download.pytorch.org/whl/cpu"

--- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix
+++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix
@ -9,23 +9,23 @@ version : builtins.getAttr version {
  "0.13.1" = {
    x86_64-linux-37 = {
      name = "torchaudio-0.13.1-cp37-cp37m-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu116/torchaudio-0.13.1%2Bcu116-cp37-cp37m-linux_x86_64.whl";
-      hash = "sha256-jrztfOrRCFKVNuXqnyeM3GCRDj/K8DDmW9jNLckCEAs=";
+      url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp37-cp37m-linux_x86_64.whl";
+      hash = "sha256-wQJJ2BPkQAGxXx8H0rt3P39wsl/6KhbF27wYHT5L6/o=";
    };
    x86_64-linux-38 = {
      name = "torchaudio-0.13.1-cp38-cp38-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu116/torchaudio-0.13.1%2Bcu116-cp38-cp38-linux_x86_64.whl";
-      hash = "sha256-oESJecUUYoHWYkPa8/+t86rjEj4F4CNpvPpCwZAk5AY=";
+      url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp38-cp38-linux_x86_64.whl";
+      hash = "sha256-QCY7LUVyj7/x2zOBJyvkKXD/blj5KZSqWHKlvUx+cmQ=";
    };
    x86_64-linux-39 = {
      name = "torchaudio-0.13.1-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu116/torchaudio-0.13.1%2Bcu116-cp39-cp39-linux_x86_64.whl";
-      hash = "sha256-W8DinLePfEUu608nApxABJdw1RVTv4QLTKLt1j2iie4=";
+      url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp39-cp39-linux_x86_64.whl";
+      hash = "sha256-Zbs2FdQz1bkwrNwQNu+xJAR9VxfbpN63D0GSkNlC+DY=";
    };
    x86_64-linux-310 = {
      name = "torchaudio-0.13.1-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu116/torchaudio-0.13.1%2Bcu116-cp310-cp310-linux_x86_64.whl";
-      hash = "sha256-3vRLFxUB3LmU9aGUjVWWYnBXBe475veBvRHvzTu/zTA=";
+      url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp310-cp310-linux_x86_64.whl";
+      hash = "sha256-k/RVSktT+WmNAiJJA8kjwSpsIrPJQtz8IXm1gdjzcUY=";
    };
    x86_64-darwin-37 = {
      name = "torchaudio-0.13.1-cp37-cp37m-macosx_10_9_x86_64.whl";
--- a/pkgs/development/python-modules/torchaudio/prefetch.sh
+++ b/pkgs/development/python-modules/torchaudio/prefetch.sh
@ -5,7 +5,7 @@ set -eou pipefail

 version=$1

-linux_cuda_version="cu116"
+linux_cuda_version="cu117"
 linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
 darwin_bucket="https://download.pytorch.org/whl"

--- a/pkgs/development/python-modules/torchvision/binary-hashes.nix
+++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix
@ -9,23 +9,23 @@ version : builtins.getAttr version {
  "0.14.1" = {
    x86_64-linux-37 = {
      name = "torchvision-0.14.1-cp37-cp37m-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu116/torchvision-0.14.1%2Bcu116-cp37-cp37m-linux_x86_64.whl";
-      hash = "sha256-SYVxnGbJYS/0uy06U8P6r92TQVKyqHQU0nvceHSkNg8=";
+      url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp37-cp37m-linux_x86_64.whl";
+      hash = "sha256-vOOhWqGuclcvjNKOSdHsGtjwhm+7ZhxzaNnBKF9psi4=";
    };
    x86_64-linux-38 = {
      name = "torchvision-0.14.1-cp38-cp38-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu116/torchvision-0.14.1%2Bcu116-cp38-cp38-linux_x86_64.whl";
-      hash = "sha256-R1k1helxw+DJgPq/v7iF61/wVHFrqlVWYMWwMEyeo50=";
+      url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp38-cp38-linux_x86_64.whl";
+      hash = "sha256-dAk4UTnOiGTOssgv/OM46+FaVRk/S4DEKm0PnP14Fik=";
    };
    x86_64-linux-39 = {
      name = "torchvision-0.14.1-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu116/torchvision-0.14.1%2Bcu116-cp39-cp39-linux_x86_64.whl";
-      hash = "sha256-qfw4BA4TPRd58TG0SXyu+DDp5pn6+JzTI81YeU/7MFs=";
+      url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp39-cp39-linux_x86_64.whl";
+      hash = "sha256-iomg7gB9fNulO9VkJth5UGCgZLiRm2GsOeAOOZ3ta+I=";
    };
    x86_64-linux-310 = {
      name = "torchvision-0.14.1-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu116/torchvision-0.14.1%2Bcu116-cp310-cp310-linux_x86_64.whl";
-      hash = "sha256-/LWNQb+V3YuF04j6GWnR3K1V7sBV4xeYHWU6BcTKbYs=";
+      url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp310-cp310-linux_x86_64.whl";
+      hash = "sha256-g9JxpTA5KBS4x/aTgihcrHx9p5uPXcxrz1bGKFR7zlM=";
    };
    x86_64-darwin-37 = {
      name = "torchvision-0.14.1-cp37-cp37m-macosx_10_9_x86_64.whl";
--- a/pkgs/development/python-modules/torchvision/prefetch.sh
+++ b/pkgs/development/python-modules/torchvision/prefetch.sh
@ -5,7 +5,7 @@ set -eou pipefail

 version=$1

-linux_cuda_version="cu116"
+linux_cuda_version="cu117"
 linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
 darwin_bucket="https://download.pytorch.org/whl"

--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "twilio";
-  version = "7.16.2";
+  version = "7.16.3";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "twilio";
    repo = "twilio-python";
    rev = "refs/tags/${version}";
-    hash = "sha256-Z783lHGZc5/Fl4pnM5mf863UVuFroRNwV5cljPSpCmw=";
+    hash = "sha256-qgsJ/i8gcuirLp8O6XShgdfxdmFyK2H+oWkiP2795rA=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/tools/algolia-cli/default.nix
+++ b/pkgs/development/tools/algolia-cli/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "algolia-cli";
-  version = "1.2.1";
+  version = "1.3.0";

  src = fetchFromGitHub {
    owner = "algolia";
    repo = "cli";
    rev = "v${version}";
-    hash = "sha256-rmxLbxotATyURRcG9ryWCDHkH7a/bop/BCDQAoQjXSo=";
+    hash = "sha256-j0d2HK4McWA2yP7pt+TUOEYVUOQP4NYOdMlK7IqaAcU=";
  };

-  vendorHash = "sha256-iG8g7mBbIulKSxc1a3/fOBOCWoFYaB5FLwJPNKJRZDg=";
+  vendorHash = "sha256-RG/aLlCve0XLj3ljBBSsloFUgNAG6faqjyMYXOo+CgI=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/development/tools/build-managers/buck/default.nix
+++ b/pkgs/development/tools/build-managers/buck/default.nix
@ -40,5 +40,7 @@ stdenv.mkDerivation rec {
    maintainers = [ maintainers.jgertm maintainers.marsam ];
    license = licenses.asl20;
    platforms = platforms.all;
+    # https://github.com/facebook/buck/issues/2666
+    broken = stdenv.isDarwin && stdenv.isAarch64;
  };
 }
--- a/pkgs/development/tools/conftest/default.nix
+++ b/pkgs/development/tools/conftest/default.nix
@ -6,15 +6,15 @@

 buildGoModule rec {
  pname = "conftest";
-  version = "0.38.0";
+  version = "0.39.0";

  src = fetchFromGitHub {
    owner = "open-policy-agent";
    repo = "conftest";
    rev = "refs/tags/v${version}";
-    hash = "sha256-kbWRjOXfDTVI07KuMQHcyxjenc7fW4oWRgyThzO0Pac=";
+    hash = "sha256-FVY4mcf08az3poA2AabqnMnQsJ1Jbqqo5oKUNft+XRk=";
  };
-  vendorHash = "sha256-8ZGZzb7Ikfk9DZQ6zyB+4JJuqyo4nlBDhGWUb8MtSys=";
+  vendorHash = "sha256-IzWb5TvZp9wfzjtk3wYWsJepwJU7qeOAoLFt91rqMRQ=";

  ldflags = [
    "-s"
--- a/pkgs/development/tools/electron-fiddle/default.nix
+++ b/pkgs/development/tools/electron-fiddle/default.nix
@ -1,5 +1,5 @@
 { buildFHSUserEnv
-, electron_20
+, electron_22
 , fetchFromGitHub
 , fetchYarnDeps
 , fixup_yarn_lock
@ -14,21 +14,21 @@

 let
  pname = "electron-fiddle";
-  version = "0.31.0";
-  electron = electron_20;
+  version = "0.32.1";
+  electron = electron_22;
  nodejs = nodejs-16_x;

  src = fetchFromGitHub {
    owner = "electron";
    repo = "fiddle";
    rev = "v${version}";
-    hash = "sha256-GueLG+RYFHi3PVVxBTtpTHhfjygcQ6ZCbrp5n5I1gBM=";
+    hash = "sha256-k+cbg03mwvobyazIUqm+TO9OMYVFQICy4CtkUZmvkr8=";
  };

  inherit (nodejs.pkgs) yarn;
  offlineCache = fetchYarnDeps {
    yarnLock = "${src}/yarn.lock";
-    hash = "sha256-WVH1A0wtQl5nR1hvaL6mzm/7XBvo311FPKmsxB82e4U=";
+    hash = "sha256-3vM+YPIA3zeWBaEFXU5lFl+VaGmAY0Qdg4pSA6mIKl0=";
  };

  electronDummyMirror = "https://electron.invalid/";
@ -89,12 +89,14 @@ in
 buildFHSUserEnv {
  name = "electron-fiddle";
  runScript = "${electron}/bin/electron ${unwrapped}/lib/electron-fiddle/resources/app.asar";
+
  extraInstallCommands = ''
    mkdir -p "$out/share/icons/hicolor/scalable/apps"
    ln -s "${unwrapped}/share/icons/hicolor/scalable/apps/electron-fiddle.svg" "$out/share/icons/hicolor/scalable/apps/"
    mkdir -p "$out/share/applications"
    cp "${desktopItem}/share/applications"/*.desktop "$out/share/applications/"
  '';
+
  targetPkgs = pkgs:
    with pkgs;
    map lib.getLib [
--- a/pkgs/development/tools/electron/generic.nix
+++ b/pkgs/development/tools/electron/generic.nix
@ -32,7 +32,7 @@ let
      ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ]
      ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ];
    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    knownVulnerabilities = optional (versionOlder version "20.0.0") "Electron version ${version} is EOL";
+    knownVulnerabilities = optional (versionOlder version "21.0.0") "Electron version ${version} is EOL";
  };

  fetcher = vers: tag: hash: fetchurl {
--- a/pkgs/development/tools/esbuild/default.nix
+++ b/pkgs/development/tools/esbuild/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "esbuild";
-  version = "0.17.5";
+  version = "0.17.7";

  src = fetchFromGitHub {
    owner = "evanw";
    repo = "esbuild";
    rev = "v${version}";
-    hash = "sha256-QLV6+1se3F7naG3jgXtSfmoTR0d7cFByRznzf+xjDpk=";
+    hash = "sha256-dfXDGXn8Az6JRTcYB/gZgHLxQUKgsWhRXl2h0RqVZ4w=";
  };

  vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@ -23,16 +23,16 @@ in

 rustPlatform.buildRustPackage rec {
  pname = "rustup";
-  version = "1.25.1";
+  version = "1.25.2";

  src = fetchFromGitHub {
    owner = "rust-lang";
    repo = "rustup";
    rev = version;
-    sha256 = "sha256-zCr8xu0j/pBsdJEAYTCGrEouA8QumBnyhM4YLFZJqZI=";
+    sha256 = "sha256-zFdw6P4yrLDshtF9A5MbkxFcUE8KvlZGx5qkW4LSPzw=";
  };

-  cargoSha256 = "sha256-FDVZn2PjqxovQmmandJICkidurhoXCAxo3bibuxQSMY=";
+  cargoSha256 = "sha256-QJKxKAW7MutpJsJwB/EImQLPaax7L/A25yRAAwEDXUQ=";

  nativeBuildInputs = [ makeBinaryWrapper pkg-config ];

--- a/pkgs/development/tools/twilio-cli/default.nix
+++ b/pkgs/development/tools/twilio-cli/default.nix
@ -2,11 +2,11 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "twilio-cli";
-  version = "5.3.3";
+  version = "5.4.0";

  src = fetchzip {
    url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-4ZgPytpv2yxKXADGR4I5+U0YjsvGEvcaF0cGrCJ21aI=";
+    sha256 = "sha256-DSYZUYC4WJiVOtxBWWGV3x/4wxpiJRQsfQYjgfNIj/4=";
  };

  buildInputs = [ nodejs ];
--- a/pkgs/os-specific/linux/atop/default.nix
+++ b/pkgs/os-specific/linux/atop/default.nix
@ -12,11 +12,11 @@

 stdenv.mkDerivation rec {
  pname = "atop";
-  version = "2.7.1";
+  version = "2.8.1";

  src = fetchurl {
    url = "https://www.atoptool.nl/download/atop-${version}.tar.gz";
-    sha256 = "sha256-ykjS8X4HHe6tXm6cyeOIv2oycNaV5hl2s3lNTZJ7XE4=";
+    sha256 = "sha256-lwBYoZt5w0RPlx+FRXKg5jiR3C1fcDf/g3VwhUzg2h4=";
  };

  nativeBuildInputs = lib.optionals withAtopgpu [
--- a/pkgs/servers/atlassian/confluence.nix
+++ b/pkgs/servers/atlassian/confluence.nix
@ -15,11 +15,11 @@ in
 optionalWarning (crowdProperties != null) "Using `crowdProperties` is deprecated!"
 (stdenvNoCC.mkDerivation rec {
  pname = "atlassian-confluence";
-  version = "7.19.1";
+  version = "7.19.5";

  src = fetchurl {
    url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
-    sha256 = "sha256-icfyxuS6chh3ibXZ0V9YYB0oCDd9o5rmcDC5Rbr0tOQ=";
+    sha256 = "sha256-32syhzbFCWzwE2NftTY58aA+iD0kABraT4FA7mYU1II=";
  };

  buildPhase = ''
--- a/pkgs/servers/misc/navidrome/default.nix
+++ b/pkgs/servers/misc/navidrome/default.nix
@ -14,13 +14,13 @@

 let

-  version = "0.48.0";
+  version = "0.49.1";

  src = fetchFromGitHub {
    owner = "navidrome";
    repo = "navidrome";
    rev = "v${version}";
-    hash = "sha256-FO2Vl3LeajvZ8CLtnsOSLXr//gaOWPbMthj70RHxp+Q=";
+    hash = "sha256-YaBtzMW2zUHRYJDDF+mMll2rMBAg5os2HSP0uEujoWI=";
  };

  ui = callPackage ./ui {
@ -35,7 +35,7 @@ buildGoModule {

  inherit src version;

-  vendorSha256 = "sha256-LPoM5RFHfTTWZtlxc59hly12zzrY8wjXGZ6xW2teOFM=";
+  vendorSha256 = "sha256-9JDP58UxlSadMXD7gUl2oN+uiYN9RlGO4HMuZJhO9mw=";

  nativeBuildInputs = [ makeWrapper pkg-config ];

@ -70,5 +70,7 @@ buildGoModule {
    sourceProvenance = with lib.sourceTypes; [ fromSource ];
    platforms = lib.platforms.unix;
    maintainers = with lib.maintainers; [ aciceri squalus ];
+    # Broken on Darwin: sandbox-exec: pattern serialization length exceeds maximum (NixOS/nix#4119)
+    broken = stdenv.isDarwin;
  };
 }
--- a/pkgs/servers/misc/navidrome/ui/node-packages.nix
+++ b/pkgs/servers/misc/navidrome/ui/node-packages.nix
--- a/pkgs/servers/misc/navidrome/update.nix
+++ b/pkgs/servers/misc/navidrome/update.nix
@ -22,7 +22,7 @@ writeScript "update-navidrome" ''
  tempDir=$(mktemp -d)
  cp $src/ui/package.json $src/ui/package-lock.json $tempDir
  cd $tempDir
-  node2nix -l package-lock.json -c node-composition.nix
+  node2nix -d -l package-lock.json -c node-composition.nix
  cp *.nix $uiDir
  rm -rf $tempDir
 ''
--- a/pkgs/servers/nats-server/default.nix
+++ b/pkgs/servers/nats-server/default.nix
@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "nats-server";
-  version = "2.9.12";
+  version = "2.9.14";

  src = fetchFromGitHub {
    owner = "nats-io";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-IhzbtTH8Vr+Z1Z9Xzz/CbmxDaR6ygdebEqz2ELa4N3E=";
+    hash = "sha256-S9K/Cu/zJufA789D/F874c+KiXley93m/wOcXZGc1aI=";
  };

  vendorHash = "sha256-tUqUB9M7doUmYRAKmzos93PCizGlHe61rpMVe0z3hVo=";
--- a/pkgs/servers/spicedb/default.nix
+++ b/pkgs/servers/spicedb/default.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "spicedb";
-  version = "1.16.1";
+  version = "1.16.2";

  src = fetchFromGitHub {
    owner = "authzed";
    repo = "spicedb";
    rev = "v${version}";
-    hash = "sha256-v30F6JhLmPLuYVyegjMPOjUKQ51xxrNfYMqaEPmRuwI=";
+    hash = "sha256-OH5O0wOg36sAKWr8sFPYU8RX/S9DbbSnGJvQ1v2pXmQ=";
  };

-  vendorHash = "sha256-TMwijafZ5ILTr9ZA5CG5uFFIZe6EmnLAL2zD25l/1gs=";
+  vendorHash = "sha256-drnVAWMj7x8HlEQXoichgl35qW07tsk3JvXU/d1ukAc=";

  subPackages = [ "cmd/spicedb" ];

--- a/pkgs/tools/compression/upx/default.nix
+++ b/pkgs/tools/compression/upx/default.nix
@ -1,39 +1,17 @@
-{ lib, stdenv, fetchurl, ucl, zlib, perl, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub, cmake }:

 stdenv.mkDerivation rec {
  pname = "upx";
-  version = "3.96";
-  src = fetchurl {
-    url = "https://github.com/upx/upx/releases/download/v${version}/${pname}-${version}-src.tar.xz";
-    sha256 = "051pk5jk8fcfg5mpgzj43z5p4cn7jy5jbyshyn78dwjqr7slsxs7";
+  version = "4.0.2";
+  src = fetchFromGitHub {
+    owner = "upx";
+    repo = pname;
+    rev = "v${version}";
+    fetchSubmodules = true;
+    sha256 = "sha256-5jqEdMlHmsD88kT/EGieL7DktppVdfWyJWGRNRKbRc4=";
  };

-  buildInputs = [ ucl zlib perl ];
-
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/upx/upx/commit/13bc031163863cb3866aa6cdc018dff0697aa5d4.patch";
-      sha256 = "sha256-7uazgx1lOgHh2J7yn3yb1q9lTJsv4BbexdGlWRiAG/M=";
-      name = "CVE-2021-20285.patch";
-    })
-  ];
-
-  preConfigure = ''
-    export UPX_UCLDIR=${ucl}
-  '';
-
-  makeFlags = [
-    "-C" "src"
-    "CHECK_WHITESPACE=true"
-
-    # Disable blanket -Werror. Triggers failues on minor gcc-11 warnings.
-    "CXXFLAGS_WERROR="
-  ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp src/upx.out $out/bin/upx
-  '';
+  nativeBuildInputs = [ cmake ];

  meta = with lib; {
    homepage = "https://upx.github.io/";
--- a/pkgs/tools/filesystems/stratisd/default.nix
+++ b/pkgs/tools/filesystems/stratisd/default.nix
@ -25,18 +25,18 @@

 stdenv.mkDerivation rec {
  pname = "stratisd";
-  version = "3.5.0";
+  version = "3.5.1";

  src = fetchFromGitHub {
    owner = "stratis-storage";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-1x6zVWFr4WNpYGVz/UGlP+lycVF2cbWJoiAmiXWzGT8=";
+    hash = "sha256-PM+griFtuFT9g+Pqx33frWrucVCXSzfyWAJJXAzrMtI=";
  };

  cargoDeps = rustPlatform.fetchCargoTarball {
    inherit src;
-    hash = "sha256-emsmdQY2od8XVjNY/rt0BbNsVy2XKtLpe8ydZGRil+Q=";
+    hash = "sha256-P5GKMNifnEvGcsg0hGZn6hg3/S44fUIzqf5Qjp4R/EM=";
  };

  postPatch = ''
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "chezmoi";
-  version = "2.29.4";
+  version = "2.30.0";

  src = fetchFromGitHub {
    owner = "twpayne";
    repo = "chezmoi";
    rev = "v${version}";
-    hash = "sha256-pvSKLWek/nCVjlfvYQIefvTt+VMmNYs58/4bPQQdfNU=";
+    hash = "sha256-Pp6QhOGG5nDc5wHIykEXIS0tQj7gPifYN5HM9tfKMR4=";
  };

-  vendorHash = "sha256-hGYcfERYxSEg+j9EDDGYVar69HoApSqxWH8IWwHaOKs=";
+  vendorHash = "sha256-EPFy9fgdVN0wdMm3zWXuLqxkmIP1Fg0hOTBbeI6w4gI=";

  doCheck = false;

--- a/pkgs/tools/misc/codevis/default.nix
+++ b/pkgs/tools/misc/codevis/default.nix
@ -0,0 +1,37 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, oniguruma
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "codevis";
+  version = "0.5.1";
+
+  src = fetchFromGitHub {
+    owner = "sloganking";
+    repo = "codevis";
+    rev = "v${version}";
+    hash = "sha256-dkzBLDZK0BJ069mlkXMGtuDodZr9sxFmpEXjp5Nf0Qk=";
+  };
+
+  cargoHash = "sha256-/2sBd2RAOjGTgXMocuKea1qhkXj81vM8PlRhYsJKx5g=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    oniguruma
+  ];
+
+  RUSTONIG_SYSTEM_LIBONIG = true;
+
+  meta = with lib; {
+    description = "A tool to take all source code in a folder and render them to one image";
+    homepage = "https://github.com/sloganking/codevis";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
--- a/pkgs/tools/misc/opentelemetry-collector/default.nix
+++ b/pkgs/tools/misc/opentelemetry-collector/default.nix
@ -12,17 +12,17 @@ let
 in
 buildGoModule rec {
  pname = "opentelemetry-collector";
-  version = "0.70.0";
+  version = "0.71.0";

  src = fetchFromGitHub {
    owner = "open-telemetry";
    repo = "opentelemetry-collector";
    rev = "v${version}";
-    sha256 = "sha256-r7Pw2zBRwaDMXZ7j8hNT1+a9sSWZpl0+8Y4rtIveoPY=";
+    sha256 = "sha256-Y6HSz81edWklXhTbaK9LvdwmgNPRMtI1BD0IfcjWl3I=";
  };
  # there is a nested go.mod
  sourceRoot = "source/cmd/otelcorecol";
-  vendorHash = "sha256-HyI3ETQQJE6bAhC2W7UfO9yqfoxu8aITcmIJmrOZpbM=";
+  vendorHash = "sha256-Zi9Rkfm+y0jZySwMJxAa5Sx/r5WAYvOVez3J0yQza2w=";

  preBuild = ''
    # set the build version, can't be done via ldflags
--- a/pkgs/tools/networking/v2ray/default.nix
+++ b/pkgs/tools/networking/v2ray/default.nix
@ -6,18 +6,18 @@

 buildGoModule rec {
  pname = "v2ray-core";
-  version = "5.2.1";
+  version = "5.3.0";

  src = fetchFromGitHub {
    owner = "v2fly";
    repo = "v2ray-core";
    rev = "v${version}";
-    hash = "sha256-Q7yro9jHNr+HSJkoO7D+T05+AK26eLtw9NfvDTWeMw8=";
+    hash = "sha256-LLvAoPA3rLGfhrWD37OVyWd4tC9mwgpE1WjK2pY27xU=";
  };

  # `nix-update` doesn't support `vendorHash` yet.
  # https://github.com/Mic92/nix-update/pull/95
-  vendorSha256 = "sha256-uXxqqPNSa2s1KmBPzvYVdTmOLxaWer9+AupdvL3+qYU=";
+  vendorSha256 = "sha256-xBNVyPN9PRkraPRzZXOguGemYPm+Jw8hl04vWV8TZaA=";

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

--- a/pkgs/tools/security/gallia/default.nix
+++ b/pkgs/tools/security/gallia/default.nix
@ -17,8 +17,13 @@ python3.pkgs.buildPythonApplication rec {
    hash = "sha256-McHzHK404kDB992T2f84dZHDxujpPIz4qglYMmv3kTw=";
  };

+  pythonRelaxDeps = [
+    "msgspec"
+  ];
+
  nativeBuildInputs = with python3.pkgs; [
    poetry-core
+    pythonRelaxDepsHook
  ];

  propagatedBuildInputs = with python3.pkgs; [
@ -54,6 +59,7 @@ python3.pkgs.buildPythonApplication rec {
  meta = with lib; {
    description = "Extendable Pentesting Framework for the Automotive Domain";
    homepage = "https://github.com/Fraunhofer-AISEC/gallia";
+    changelog = "https://github.com/Fraunhofer-AISEC/gallia/releases/tag/v${version}";
    license = with licenses; [ asl20 ];
    maintainers = with maintainers; [ fab rumpelsepp ];
    platforms = platforms.linux;
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -2189,7 +2189,7 @@ with pkgs;

  pcsxr = callPackage ../applications/emulators/pcsxr { };

-  ppsspp = libsForQt5.callPackage ../applications/emulators/ppsspp { };
+  ppsspp = callPackage ../applications/emulators/ppsspp { };

  ppsspp-sdl = ppsspp;

@ -6274,6 +6274,8 @@ with pkgs;

  codebraid = callPackage ../tools/misc/codebraid { };

+  codevis = callPackage ../tools/misc/codevis { };
+
  compass = callPackage ../development/tools/compass { };

  cone = callPackage ../development/compilers/cone {