Merge staging-next into staging

2024-11-03 18:04:43 +00:00 · 2024-11-03 18:04:43 +00:00 · bee49bdce0
commit bee49bdce0
parent f995406236 cb404b388f
106 changed files with 1224 additions and 1132 deletions
--- a/doc/languages-frameworks/gnome.section.md
+++ b/doc/languages-frameworks/gnome.section.md
@ -64,7 +64,7 @@ To avoid costly file system access when locating icons, GTK, [as well as Qt](htt

 ### Packaging icon themes {#ssec-icon-theme-packaging}

-Icon themes may inherit from other icon themes. The inheritance is specified using the `Inherits` key in the `index.theme` file distributed with the icon theme. According to the [icon theme specification](https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html), icons not provided by the theme are looked for in its parent icon themes. Therefore the parent themes should be installed as dependencies for a more complete experience regarding the icon sets used.
+Icon themes may inherit from other icon themes. The inheritance is specified using the `Inherits` key in the `index.theme` file distributed with the icon theme. According to the [icon theme specification](https://specifications.freedesktop.org/icon-theme-spec/latest), icons not provided by the theme are looked for in its parent icon themes. Therefore the parent themes should be installed as dependencies for a more complete experience regarding the icon sets used.

 The package `hicolor-icon-theme` provides a setup hook which makes symbolic links for the parent themes into the directory `share/icons` of the current theme directory in the nix store, making sure they can be found at runtime. For that to work the packages providing parent icon themes should be listed as propagated build dependencies, together with `hicolor-icon-theme`.

--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -12193,6 +12193,11 @@
    github = "lenivaya";
    githubId = 49302467;
  };
+  lenny = {
+    name = "Lenny.";
+    matrix = "lenny@flipdot.org";
+    keys = [ { fingerprint = "6D63 2D4D 0CFE 8D53 F5FD  C7ED 738F C800 6E9E A634"; } ];
+  };
  leo248 = {
    github = "leo248";
    githubId = 95365184;
--- a/nixos/modules/config/xdg/autostart.nix
+++ b/nixos/modules/config/xdg/autostart.nix
@ -10,7 +10,7 @@
      default = true;
      description = ''
        Whether to install files to support the
-        [XDG Autostart specification](https://specifications.freedesktop.org/autostart-spec/autostart-spec-latest.html).
+        [XDG Autostart specification](https://specifications.freedesktop.org/autostart-spec/latest).
      '';
    };
  };
--- a/nixos/modules/config/xdg/icons.nix
+++ b/nixos/modules/config/xdg/icons.nix
@ -10,7 +10,7 @@
      default = true;
      description = ''
        Whether to install files to support the
-        [XDG Icon Theme specification](https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html).
+        [XDG Icon Theme specification](https://specifications.freedesktop.org/icon-theme-spec/latest).
      '';
    };
    xdg.icons.fallbackCursorThemes = lib.mkOption {
--- a/nixos/modules/config/xdg/menus.nix
+++ b/nixos/modules/config/xdg/menus.nix
@ -10,7 +10,7 @@
      default = true;
      description = ''
        Whether to install files to support the
-        [XDG Desktop Menu specification](https://specifications.freedesktop.org/menu-spec/menu-spec-latest.html).
+        [XDG Desktop Menu specification](https://specifications.freedesktop.org/menu-spec/latest).
      '';
    };
  };
--- a/nixos/modules/config/xdg/mime.nix
+++ b/nixos/modules/config/xdg/mime.nix
@ -17,8 +17,8 @@ in
      default = true;
      description = ''
        Whether to install files to support the
-        [XDG Shared MIME-info specification](https://specifications.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html) and the
-        [XDG MIME Applications specification](https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html).
+        [XDG Shared MIME-info specification](https://specifications.freedesktop.org/shared-mime-info-spec/latest) and the
+        [XDG MIME Applications specification](https://specifications.freedesktop.org/mime-apps-spec/latest).
      '';
    };

@ -32,7 +32,7 @@ in
      description = ''
        Adds associations between mimetypes and applications. See the
        [
-        specifications](https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html#associations) for more information.
+        specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/associations) for more information.
      '';
    };

@ -46,7 +46,7 @@ in
      description = ''
        Sets the default applications for given mimetypes. See the
        [
-        specifications](https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html#default) for more information.
+        specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/default) for more information.
      '';
    };

@ -60,7 +60,7 @@ in
      description = ''
        Removes associations between mimetypes and applications. See the
        [
-        specifications](https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html#associations) for more information.
+        specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/associations) for more information.
      '';
    };
  };
--- a/nixos/modules/services/misc/renovate.nix
+++ b/nixos/modules/services/misc/renovate.nix
@ -100,12 +100,10 @@ in
      ] ++ cfg.runtimePackages;

      serviceConfig = {
-        Type = "oneshot";
        User = "renovate";
        Group = "renovate";
        DynamicUser = true;
        LoadCredential = lib.mapAttrsToList (name: value: "SECRET-${name}:${value}") cfg.credentials;
-        RemainAfterExit = false;
        Restart = "on-failure";
        CacheDirectory = "renovate";
        StateDirectory = "renovate";
--- a/nixos/tests/os-prober.nix
+++ b/nixos/tests/os-prober.nix
@ -84,6 +84,10 @@ in {
          docbook5
          docbook_xsl_ns
          grub2
+          nixos-artwork.wallpapers.simple-dark-gray-bootloader
+          perlPackages.FileCopyRecursive
+          perlPackages.XMLSAX
+          perlPackages.XMLSAXBase
          kbd
          kbd.dev
          kmod.dev
@ -92,16 +96,20 @@ in {
          libxml2.bin
          libxslt.bin
          nixos-artwork.wallpapers.simple-dark-gray-bottom
-          ntp
+          perlPackages.ConfigIniFiles
+          perlPackages.FileSlurp
+          perlPackages.JSON
          perlPackages.ListCompare
          perlPackages.XMLLibXML
-          python3
+          # make-options-doc/default.nix
+          (python3.withPackages (p: [ p.mistune ]))
          shared-mime-info
-          stdenv
          sudo
+          switch-to-configuration-ng
          texinfo
          unionfs-fuse
          xorg.lndir
+          os-prober

          # add curl so that rather than seeing the test attempt to download
          # curl's tarball, we see what it's trying to download
--- a/nixos/tests/renovate.nix
+++ b/nixos/tests/renovate.nix
@ -58,12 +58,12 @@ import ./make-test-python.nix (
      machine.succeed("git -C /tmp/kitty push origin")

      machine.succeed(f"echo '{accessToken}' > /etc/renovate-token")
-      machine.systemctl("start renovate.service")
+      machine.systemctl("start --wait renovate.service")

      machine.succeed("tea pulls list --repo meow/kitty | grep 'Configure Renovate'")
      machine.succeed("tea pulls merge --repo meow/kitty 1")

-      machine.systemctl("start renovate.service")
+      machine.systemctl("start --wait renovate.service")
    '';
  }
 )
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@ -1,98 +0,0 @@
-{ lib
-, stdenv
-, alsa-lib
-, fetchFromGitHub
-, fftwFloat
-, freetype
-, libGL
-, libX11
-, libXcursor
-, libXext
-, libXrender
-, meson
-, ninja
-, pkg-config
-}:
-
-let rpathLibs = [
-  fftwFloat
-];
-in
-stdenv.mkDerivation rec {
-  pname = "distrho-ports";
-  version = "2021-03-15";
-
-  src = fetchFromGitHub {
-    owner = "DISTRHO";
-    repo = "DISTRHO-Ports";
-    rev = version;
-    sha256 = "00fgqwayd20akww3n2imyqscmyrjyc9jj0ar13k9dhpaxqk2jxbf";
-  };
-
-  nativeBuildInputs = [ pkg-config meson ninja ];
-
-  buildInputs = rpathLibs ++ [
-    alsa-lib
-    freetype
-    libGL
-    libX11
-    libXcursor
-    libXext
-    libXrender
-  ];
-
-  postFixup = ''
-    for file in \
-      $out/lib/lv2/vitalium.lv2/vitalium.so \
-      $out/lib/vst/vitalium.so \
-      $out/lib/vst3/vitalium.vst3/Contents/x86_64-linux/vitalium.so
-    do
-      patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $file)" $file
-    done
-  '';
-
-  meta = with lib; {
-    homepage = "http://distrho.sourceforge.net/ports";
-    description = "Linux audio plugins and LV2 ports";
-    longDescription = ''
-      Includes:
-        arctican-function
-        arctican-pilgrim
-        dexed
-        drowaudio-distortion
-        drowaudio-distortionshaper
-        drowaudio-flanger
-        drowaudio-reverb
-        drowaudio-tremolo
-        drumsynth
-        easySSP
-        eqinox
-        HiReSam
-        juce-opl
-        klangfalter
-        LUFSMeter
-        LUFSMeter-Multi
-        luftikus
-        obxd
-        pitchedDelay
-        refine
-        stereosourceseparation
-        swankyamp
-        tal-dub-3
-        tal-filter
-        tal-filter-2
-        tal-noisemaker
-        tal-reverb
-        tal-reverb-2
-        tal-reverb-3
-        tal-vocoder-2
-        temper
-        vex
-        vitalium
-        wolpertinger
-    '';
-    license = with licenses; [ gpl2Only gpl3Only gpl2Plus lgpl2Plus lgpl3Only mit ];
-    maintainers = [ ];
-    platforms = [ "x86_64-linux" ];
-  };
-}
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@ -50,27 +50,14 @@ let
  } else portaudio;
 in stdenv'.mkDerivation (finalAttrs: {
  pname = "musescore";
-  version = "4.4.2";
+  version = "4.4.3";

  src = fetchFromGitHub {
    owner = "musescore";
    repo = "MuseScore";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-wgujiFvaWejSEXTbq/Re/7Ca1jIqso2uZej3Lb3V4I8=";
+    sha256 = "sha256-bHpPhav9JBPkwJA9o+IFHRWbvxWnGkD1wHBHS4XJ/YE=";
  };
-  patches = [
-    # https://github.com/musescore/MuseScore/pull/24326
-    (fetchpatch {
-      name = "fix-menubar-with-qt6.5+.patch";
-      url = "https://github.com/musescore/MuseScore/pull/24326/commits/b274f13311ad0b2bce339634a006ba22fbd3379e.patch";
-      hash = "sha256-ZGmjRa01CBEIxJdJYQMhdg4A9yjWdlgn0pCPmENBTq0=";
-    })
-    (fetchpatch {
-      name = "fix-crash-accessing-uninitialized-properties.patch";
-      url = "https://github.com/musescore/MuseScore/pull/24714.patch";
-      hash = "sha256-ErrCU/U+wyfD7R8kiZTifGIeuCAdKi1q7uxYsoE/OLA=";
-    })
-  ];

  cmakeFlags = [
    "-DMUSE_APP_BUILD_MODE=release"
--- a/pkgs/applications/gis/gmt/default.nix
+++ b/pkgs/applications/gis/gmt/default.nix
@ -1,112 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  curl,
-  Accelerate,
-  CoreGraphics,
-  CoreVideo,
-  fftwSinglePrec,
-  netcdf,
-  libxml2,
-  pcre,
-  gdal,
-  blas,
-  lapack,
-  glibc,
-  ghostscript,
-  dcw-gmt,
-  gshhg-gmt,
-}:
-
-/*
-  The onus is on the user to also install:
-   - ffmpeg for webm or mp4 output
-   - graphicsmagick for gif output
-*/
-
-let
-  # Certainly not an ideal situation, See:
-  # https://github.com/NixOS/nixpkgs/pull/340707#issuecomment-2361894717
-  netcdf' = netcdf.override {
-    libxml2 = libxml2.override {
-      enableHttp = true;
-    };
-  };
-in stdenv.mkDerivation (finalAttrs: {
-  pname = "gmt";
-  version = "6.5.0";
-  src = fetchFromGitHub {
-    owner = "GenericMappingTools";
-    repo = "gmt";
-    rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-KKIYhljCtk9t9CuvTLsSGvUkUwazWTm9ymBB3wLwSoI=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-  ];
-
-  buildInputs =
-    [
-      curl
-      gdal
-      netcdf'
-      pcre
-      dcw-gmt
-      gshhg-gmt
-    ]
-    ++ (
-      if stdenv.hostPlatform.isDarwin then
-        [
-          Accelerate
-          CoreGraphics
-          CoreVideo
-        ]
-      else
-        [
-          glibc
-          fftwSinglePrec
-          blas
-          lapack
-        ]
-    );
-
-  propagatedBuildInputs = [
-    ghostscript
-  ];
-
-  cmakeFlags =
-    [
-      "-DGMT_DOCDIR=share/doc/gmt"
-      "-DGMT_MANDIR=share/man"
-      "-DGMT_LIBDIR=lib"
-      "-DCOPY_GSHHG:BOOL=FALSE"
-      "-DGSHHG_ROOT=${gshhg-gmt.out}/share/gshhg-gmt"
-      "-DCOPY_DCW:BOOL=FALSE"
-      "-DDCW_ROOT=${dcw-gmt.out}/share/dcw-gmt"
-      "-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES:BOOL=FALSE"
-      "-DGMT_ENABLE_OPENMP:BOOL=TRUE"
-      "-DGMT_INSTALL_MODULE_LINKS:BOOL=FALSE"
-      "-DLICENSE_RESTRICTED=LGPL" # "GPL" and "no" also valid
-    ];
-
-  meta = {
-    homepage = "https://www.generic-mapping-tools.org";
-    description = "Tools for manipulating geographic and cartesian data sets";
-    longDescription = ''
-      GMT is an open-source collection of command-line tools for manipulating
-      geographic and Cartesian data sets (including filtering, trend fitting,
-      gridding, projecting, etc.) and producing high-quality illustrations
-      ranging from simple x–y plots via contour maps to artificially illuminated
-      surfaces and 3D perspective views. It supports many map projections and
-      transformations and includes supporting data such as coastlines, rivers,
-      and political boundaries and optionally country polygons.
-    '';
-    platforms = lib.platforms.unix;
-    license = lib.licenses.lgpl3Plus;
-    maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]);
-  };
-
-})
--- a/pkgs/applications/graphics/xpano/default.nix
+++ b/pkgs/applications/graphics/xpano/default.nix
@ -15,13 +15,13 @@

 stdenv.mkDerivation rec {
  pname = "xpano";
-  version = "0.19.2";
+  version = "0.19.3";

  src = fetchFromGitHub {
    owner = "krupkat";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-CgUiZHjWQSoAam2Itan3Zadt8+w6j9W5KGMZ5f6bHiQ=";
+    sha256 = "sha256-f2qoBpZ5lPBocPas8KMsY5bSYL20gO+ZHLz2R66qSig=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
@ -27,6 +27,16 @@ in
      fetchSubmodules = true;
    };

+    patches = (oldAttrs.patches or []) ++ [
+      (fetchpatch {
+        url = "https://webrtc.googlesource.com/src/+/e7d10047096880feb5e9846375f2da54aef91202%5E%21/?format=TEXT";
+        decode = "base64 -d";
+        stripLen = 1;
+        extraPrefix = "src/";
+        hash = "sha256-goxnuRRbwcdfIk1jFaKGiKCTCYn2saEj7En1Iyglzko=";
+      })
+    ];
+
    nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ yasm ];
  });

@ -44,8 +54,6 @@ in
  };

  patches = [
-    ./macos.patch
-    ./macos-opengl.patch
    ./macos-qt5.patch
    (fetchpatch {
      url = "https://gitlab.com/mnauw/cppgir/-/commit/c8bb1c6017a6f7f2e47bd10543aea6b3ec69a966.patch";
--- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch
+++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch
@ -1,66 +0,0 @@
-diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp
-index 655e7cf410..c356acbffe 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip.cpp
-+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp
-@@ -1333,7 +1333,7 @@ void Pip::setupStreaming() {
- Ui::GL::ChosenRenderer Pip::chooseRenderer(
- 		Ui::GL::Capabilities capabilities) {
- 	const auto use = Platform::IsMac()
-		? true
-+		? false
- 		: capabilities.transparency;
- 	LOG(("OpenGL: %1 (PipPanel)").arg(Logs::b(use)));
- 	if (use) {
-Submodule Telegram/lib_ui contains modified content
-diff --git a/Telegram/lib_ui/ui/gl/gl_detection.cpp b/Telegram/lib_ui/ui/gl/gl_detection.cpp
-index 150eb8b..c7ce9f9 100644
--- a/Telegram/lib_ui/ui/gl/gl_detection.cpp
-+++ b/Telegram/lib_ui/ui/gl/gl_detection.cpp
-@@ -236,7 +236,7 @@ Capabilities CheckCapabilities(QWidget *widget, bool avoidWidgetCreation) {
- 
- Backend ChooseBackendDefault(Capabilities capabilities) {
- 	const auto use = ::Platform::IsMac()
-		? true
-+		? false
- 		: ::Platform::IsWindows()
- 		? capabilities.supported
- 		: capabilities.transparency;
-diff --git a/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm b/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm
-index 7b29363..22c4fb3 100644
--- a/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm
-+++ b/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm
-@@ -16,7 +16,6 @@
- #include <QtCore/QAbstractNativeEventFilter>
- #include <QtGui/QWindow>
- #include <QtGui/QtEvents>
-#include <QOpenGLWidget>
- #include <Cocoa/Cocoa.h>
- 
- @interface WindowObserver : NSObject {
-@@ -138,7 +137,6 @@ public:
- 
- private:
- 	void init();
-	void initOpenGL();
- 	void resolveWeakPointers();
- 	void revalidateWeakPointers() const;
- 	void initCustomTitle();
-@@ -272,10 +270,6 @@ void WindowHelper::Private::enforceStyle() {
- 	}
- }
- 
-void WindowHelper::Private::initOpenGL() {
-	auto forceOpenGL = std::make_unique<QOpenGLWidget>(_owner->window());
-}
-
- void WindowHelper::Private::resolveWeakPointers() {
- 	if (!_owner->window()->winId()) {
- 		_owner->window()->createWinId();
-@@ -338,7 +332,6 @@ void WindowHelper::Private::initCustomTitle() {
- }
- 
- void WindowHelper::Private::init() {
-	initOpenGL();
- 	resolveWeakPointers();
- 	initCustomTitle();
- }
--- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch
+++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch
@ -1,171 +0,0 @@
-diff --git a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm
-index ef544803e9..69c61b3139 100644
--- a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm
-+++ b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm
-@@ -97,9 +97,11 @@ void MacOverlayWidgetHelper::updateStyles(bool fullscreen) {
- 	[window setTitleVisibility:NSWindowTitleHidden];
- 	[window setTitlebarAppearsTransparent:YES];
- 	[window setStyleMask:[window styleMask] | NSWindowStyleMaskFullSizeContentView];
-+#if 0
- 	if (@available(macOS 12.0, *)) {
- 		_data->topNotchSkip = [[window screen] safeAreaInsets].top;
- 	}
-+#endif
- }
- 
- void MacOverlayWidgetHelper::refreshButtons(bool fullscreen) {
-Submodule Telegram/lib_base contains modified content
-diff --git a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm
-index 7ce90d3..dac3c2c 100644
--- a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm
-+++ b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm
-@@ -138,6 +138,7 @@ BatterySaving::BatterySaving(Fn<void()> changedCallback) {
- 	_observer = [[LowPowerModeObserver alloc] initWithCallback:std::move(wrapped)];
- 
- 	NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
-+#if 0
- 	if (@available(macOS 12.0, *)) {
- 		[center
- 			addObserver: _observer
-@@ -145,6 +146,7 @@ BatterySaving::BatterySaving(Fn<void()> changedCallback) {
- 			name: NSProcessInfoPowerStateDidChangeNotification
- 			object: nil];
- 	}
-+#endif
- 	[center
- 		addObserver: _observer
- 		selector: @selector(powerStateChanged:)
-@@ -178,11 +180,13 @@ std::optional<bool> BatterySaving::enabled() const {
- 		return std::nullopt;
- 	}
- 	NSProcessInfo *info = [NSProcessInfo processInfo];
-+#if 0
- 	if (@available(macOS 12.0, *)) {
- 		if ([info isLowPowerModeEnabled]) {
- 			return true;
- 		}
- 	}
-+#endif
- 	const auto state = DetectBatteryState();
- 	if (!state.has || !state.draining) {
- 		return false;
-Submodule Telegram/lib_webrtc contains modified content
-diff --git a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm
-index 7521c08..5e22da2 100644
--- a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm
-+++ b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm
-@@ -364,6 +364,7 @@ EnvironmentMac::EnvironmentMac(not_null<EnvironmentDelegate*> delegate)
- 	DefaultCaptureDeviceChangedMonitor.registerEnvironment(this);
- 	AudioDeviceListChangedMonitor.registerEnvironment(this);
- 
-+#if 0
- 	if (@available(macOS 14.0, *)) {
- 		const auto weak = base::make_weak(this);
- 		id block = [^(BOOL shouldBeMuted){
-@@ -387,6 +388,7 @@ EnvironmentMac::EnvironmentMac(not_null<EnvironmentDelegate*> delegate)
- 			setInputMuteStateChangeHandler:block
- 			error:nil];
- 	}
-+#endif
- }
- 
- EnvironmentMac::~EnvironmentMac() {
-@@ -537,15 +539,18 @@ void EnvironmentMac::devicesRequested(DeviceType type) {
- }
- 
- void EnvironmentMac::setCaptureMuted(bool muted) {
-+#if 0
- 	if (@available(macOS 14.0, *)) {
- 		if (!_captureMuteNotification) {
- 			const auto value = muted ? YES : NO;
- 			[[AVAudioApplication sharedInstance] setInputMuted:value error:nil];
- 		}
- 	}
-+#endif
- }
- 
- void EnvironmentMac::captureMuteSubscribe() {
-+#if 0
- 	if (@available(macOS 14.0, *)) {
- 		id observer = [[InputMuteObserver alloc] init];
- 		[[[NSWorkspace sharedWorkspace] notificationCenter]
-@@ -578,6 +583,7 @@ void EnvironmentMac::captureMuteSubscribe() {
- 			[observer release];
- 		});
- 	}
-+#endif
- }
- 
- void EnvironmentMac::captureMuteUnsubscribe() {
-@@ -595,6 +601,7 @@ void EnvironmentMac::captureMuteRestartAdm() {
- void EnvironmentMac::setCaptureMuteTracker(
- 		not_null<CaptureMuteTracker*> tracker,
- 		bool track) {
-+#if 0
- 	if (@available(macOS 14.0, *)) {
- 		if (track) {
- 			if (!_captureMuteTracker) {
-@@ -619,6 +626,7 @@ void EnvironmentMac::setCaptureMuteTracker(
- 			}
- 		}
- 	}
-+#endif
- }
- 
- std::unique_ptr<Environment> CreateEnvironment(
-Submodule Telegram/lib_webview contains modified content
-diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm
-index e7808fc..34020f0 100644
--- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm
-+++ b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm
-@@ -334,6 +334,7 @@ Instance::Instance(Config config) {
- 	_handler = [[Handler alloc] initWithMessageHandler:config.messageHandler navigationStartHandler:config.navigationStartHandler navigationDoneHandler:config.navigationDoneHandler dialogHandler:config.dialogHandler dataRequested:handleDataRequest];
- 	_dataRequestHandler = std::move(config.dataRequestHandler);
- 	[configuration setURLSchemeHandler:_handler forURLScheme:stdToNS(kDataUrlScheme)];
-+#if 0
- 	if (@available(macOS 14, *)) {
- 		if (config.userDataToken != LegacyStorageIdToken().toStdString()) {
- 			NSUUID *uuid = UuidFromToken(config.userDataToken);
-@@ -341,10 +342,13 @@ Instance::Instance(Config config) {
- 			[uuid release];
- 		}
- 	}
-+#endif
- 	_webview = [[WKWebView alloc] initWithFrame:NSZeroRect configuration:configuration];
-+#if 0
- 	if (@available(macOS 13.3, *)) {
- 		_webview.inspectable = config.debug ? YES : NO;
- 	}
-+#endif
- 	[_manager addScriptMessageHandler:_handler name:@"external"];
- 	[_webview setNavigationDelegate:_handler];
- 	[_webview setUIDelegate:_handler];
-@@ -700,10 +704,12 @@ void *Instance::winId() {
- }
- 
- void Instance::setOpaqueBg(QColor opaqueBg) {
-+#if 0
- 	if (@available(macOS 12.0, *)) {
- 		[_webview setValue: @NO forKey: @"drawsBackground"];
- 		[_webview setUnderPageBackgroundColor:[NSColor clearColor]];
- 	}
-+#endif
- }
- 
- void Instance::resizeToWindow() {
-@@ -739,6 +745,7 @@ std::string GenerateStorageToken() {
- }
- 
- void ClearStorageDataByToken(const std::string &token) {
-+#if 0
- 	if (@available(macOS 14, *)) {
- 		if (!token.empty() && token != LegacyStorageIdToken().toStdString()) {
- 			if (NSUUID *uuid = UuidFromToken(token)) {
-@@ -754,6 +761,7 @@ void ClearStorageDataByToken(const std::string &token) {
- 			}
- 		}
- 	}
-+#endif
- }
- 
- } // namespace Webview
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
@ -6,7 +6,6 @@
 , cmake
 , ninja
 , clang
-, lld
 , python3
 , wrapQtAppsHook
 , tg_owt ? callPackage ./tg_owt.nix { inherit stdenv; }
@ -38,7 +37,7 @@
 , glib-networking
 , webkitgtk_4_1
 , libicns
-, darwin
+, apple-sdk_15
 , nix-update-script
 }:

@ -61,10 +60,6 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-frz425V5eRulNVxCf457TWQAzU/f9/szD/sx3/LYQ2Y=";
  };

-  patches = [
-    ./macos.patch
-  ];
-
  postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
    substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \
      --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
@ -98,8 +93,6 @@ stdenv.mkDerivation (finalAttrs: {
    gobject-introspection
  ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withWebKitGTK) [
    wrapGAppsHook3
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    lld
  ];

  buildInputs = [
@ -130,45 +123,10 @@ stdenv.mkDerivation (finalAttrs: {
  ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withWebKitGTK) [
    glib-networking
    webkitgtk_4_1
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
-    Cocoa
-    CoreFoundation
-    CoreServices
-    CoreText
-    CoreGraphics
-    CoreMedia
-    OpenGL
-    AudioUnit
-    ApplicationServices
-    Foundation
-    AGL
-    Security
-    SystemConfiguration
-    Carbon
-    AudioToolbox
-    VideoToolbox
-    VideoDecodeAcceleration
-    AVFoundation
-    CoreAudio
-    CoreVideo
-    CoreMediaIO
-    QuartzCore
-    AppKit
-    CoreWLAN
-    WebKit
-    IOKit
-    GSS
-    MediaPlayer
-    IOSurface
-    Metal
-    NaturalLanguage
-    LocalAuthentication
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_15
    libicns
-  ]);
-
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    NIX_CFLAGS_LINK = "-fuse-ld=lld";
-  };
+  ];

  cmakeFlags = [
    # We're allowed to used the API ID of the Snap package:
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch
@ -1,145 +0,0 @@
-diff --git a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm
-index ef544803e9..69c61b3139 100644
--- a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm
-+++ b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm
-@@ -97,9 +97,11 @@ void MacOverlayWidgetHelper::updateStyles(bool fullscreen) {
- 	[window setTitleVisibility:NSWindowTitleHidden];
- 	[window setTitlebarAppearsTransparent:YES];
- 	[window setStyleMask:[window styleMask] | NSWindowStyleMaskFullSizeContentView];
-+#if 0
- 	if (@available(macOS 12.0, *)) {
- 		_data->topNotchSkip = [[window screen] safeAreaInsets].top;
- 	}
-+#endif
- }
- 
- void MacOverlayWidgetHelper::refreshButtons(bool fullscreen) {
-Submodule Telegram/lib_base contains modified content
-diff --git a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm
-index 7ce90d3..dac3c2c 100644
--- a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm
-+++ b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm
-@@ -138,6 +138,7 @@ BatterySaving::BatterySaving(Fn<void()> changedCallback) {
- 	_observer = [[LowPowerModeObserver alloc] initWithCallback:std::move(wrapped)];
- 
- 	NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
-+#if 0
- 	if (@available(macOS 12.0, *)) {
- 		[center
- 			addObserver: _observer
-@@ -145,6 +146,7 @@ BatterySaving::BatterySaving(Fn<void()> changedCallback) {
- 			name: NSProcessInfoPowerStateDidChangeNotification
- 			object: nil];
- 	}
-+#endif
- 	[center
- 		addObserver: _observer
- 		selector: @selector(powerStateChanged:)
-@@ -178,11 +180,13 @@ std::optional<bool> BatterySaving::enabled() const {
- 		return std::nullopt;
- 	}
- 	NSProcessInfo *info = [NSProcessInfo processInfo];
-+#if 0
- 	if (@available(macOS 12.0, *)) {
- 		if ([info isLowPowerModeEnabled]) {
- 			return true;
- 		}
- 	}
-+#endif
- 	const auto state = DetectBatteryState();
- 	if (!state.has || !state.draining) {
- 		return false;
-Submodule Telegram/lib_webrtc contains modified content
-diff --git a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm
-index 7521c08..5e22da2 100644
--- a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm
-+++ b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm
-@@ -364,6 +364,7 @@ EnvironmentMac::EnvironmentMac(not_null<EnvironmentDelegate*> delegate)
- 	DefaultCaptureDeviceChangedMonitor.registerEnvironment(this);
- 	AudioDeviceListChangedMonitor.registerEnvironment(this);
- 
-+#if 0
- 	if (@available(macOS 14.0, *)) {
- 		const auto weak = base::make_weak(this);
- 		id block = [^(BOOL shouldBeMuted){
-@@ -387,6 +388,7 @@ EnvironmentMac::EnvironmentMac(not_null<EnvironmentDelegate*> delegate)
- 			setInputMuteStateChangeHandler:block
- 			error:nil];
- 	}
-+#endif
- }
- 
- EnvironmentMac::~EnvironmentMac() {
-@@ -537,15 +539,18 @@ void EnvironmentMac::devicesRequested(DeviceType type) {
- }
- 
- void EnvironmentMac::setCaptureMuted(bool muted) {
-+#if 0
- 	if (@available(macOS 14.0, *)) {
- 		if (!_captureMuteNotification) {
- 			const auto value = muted ? YES : NO;
- 			[[AVAudioApplication sharedInstance] setInputMuted:value error:nil];
- 		}
- 	}
-+#endif
- }
- 
- void EnvironmentMac::captureMuteSubscribe() {
-+#if 0
- 	if (@available(macOS 14.0, *)) {
- 		id observer = [[InputMuteObserver alloc] init];
- 		[[[NSWorkspace sharedWorkspace] notificationCenter]
-@@ -578,6 +583,7 @@ void EnvironmentMac::captureMuteSubscribe() {
- 			[observer release];
- 		});
- 	}
-+#endif
- }
- 
- void EnvironmentMac::captureMuteUnsubscribe() {
-@@ -595,6 +601,7 @@ void EnvironmentMac::captureMuteRestartAdm() {
- void EnvironmentMac::setCaptureMuteTracker(
- 		not_null<CaptureMuteTracker*> tracker,
- 		bool track) {
-+#if 0
- 	if (@available(macOS 14.0, *)) {
- 		if (track) {
- 			if (!_captureMuteTracker) {
-@@ -619,6 +626,7 @@ void EnvironmentMac::setCaptureMuteTracker(
- 			}
- 		}
- 	}
-+#endif
- }
- 
- std::unique_ptr<Environment> CreateEnvironment(
-Submodule Telegram/lib_webview contains modified content
-diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm
-index 738e574..80ff5f0 100644
--- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm
-+++ b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm
-@@ -314,9 +314,11 @@ Instance::Instance(Config config) {
- 	_dataRequestHandler = std::move(config.dataRequestHandler);
- 	[configuration setURLSchemeHandler:_handler forURLScheme:stdToNS(kDataUrlScheme)];
- 	_webview = [[WKWebView alloc] initWithFrame:NSZeroRect configuration:configuration];
-+#if 0
- 	if (@available(macOS 13.3, *)) {
- 		_webview.inspectable = config.debug ? YES : NO;
- 	}
-+#endif
- 	[_manager addScriptMessageHandler:_handler name:@"external"];
- 	[_webview setNavigationDelegate:_handler];
- 	[_webview setUIDelegate:_handler];
-@@ -658,10 +660,12 @@ void *Instance::winId() {
- }
- 
- void Instance::setOpaqueBg(QColor opaqueBg) {
-+#if 0
- 	if (@available(macOS 12.0, *)) {
- 		[_webview setValue: @NO forKey: @"drawsBackground"];
- 		[_webview setUnderPageBackgroundColor:[NSColor clearColor]];
- 	}
-+#endif
- }
- 
- void Instance::resizeToWindow() {
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  fetchpatch2,
  pkg-config,
  cmake,
  ninja,
@ -28,34 +27,22 @@
  mesa,
  libdrm,
  libGL,
-  darwin,
+  apple-sdk_15,
  unstableGitUpdater,
 }:

 stdenv.mkDerivation {
  pname = "tg_owt";
-  version = "0-unstable-2024-08-04";
+  version = "0-unstable-2024-10-28";

  src = fetchFromGitHub {
    owner = "desktop-app";
    repo = "tg_owt";
-    rev = "dc17143230b5519f3c1a8da0079e00566bd4c5a8";
-    hash = "sha256-7j7hBIOXEdNJDnDSVUqy234nkTCaeZ9tDAzqvcuaq0o=";
+    rev = "8198c4d8b91e22d68eb5c7327fd408e3b6abcc79";
+    hash = "sha256-3sLa3Px0VWgRYqnnLlwLnx+WWnneqZyhQPrRMBriXQA=";
    fetchSubmodules = true;
  };

-  patches = [
-    # Remove usage of AVCodecContext::reordered_opaque
-    (fetchpatch2 {
-      name = "webrtc-ffmpeg-7.patch";
-      url = "https://webrtc.googlesource.com/src/+/e7d10047096880feb5e9846375f2da54aef91202%5E%21/?format=TEXT";
-      decode = "base64 -d";
-      stripLen = 1;
-      extraPrefix = "src/";
-      hash = "sha256-EdwHeVko8uDsP5GTw2ryWiQgRVCAdPc1me6hySdiwMU=";
-    })
-  ];
-
  postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
    substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \
      --replace-fail '"libEGL.so.1"' '"${lib.getLib libGL}/lib/libEGL.so.1"' \
@ -102,26 +89,9 @@ stdenv.mkDerivation {
      libdrm
      libGL
    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (
-      with darwin.apple_sdk.frameworks;
-      [
-        Cocoa
-        AppKit
-        IOKit
-        IOSurface
-        Foundation
-        AVFoundation
-        CoreMedia
-        VideoToolbox
-        CoreGraphics
-        CoreVideo
-        OpenGL
-        Metal
-        MetalKit
-        CoreFoundation
-        ApplicationServices
-      ]
-    );
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      apple-sdk_15
+    ];

  passthru.updateScript = unstableGitUpdater { };

--- a/pkgs/applications/science/electronics/openroad/default.nix
+++ b/pkgs/applications/science/electronics/openroad/default.nix
@ -128,5 +128,6 @@ mkDerivation rec {
    license = licenses.bsd3;
    maintainers = with maintainers; [ trepetti ];
    platforms = platforms.linux;
+    broken = true; # last successful build 2024-06-30
  };
 }
--- a/pkgs/applications/version-management/tailor/default.nix
+++ b/pkgs/applications/version-management/tailor/default.nix
@ -1,38 +0,0 @@
-{ lib
-, python3
-, fetchurl
-}:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "tailor";
-  version = "0.9.37";
-
-  src = fetchurl {
-    url = "https://gitlab.com/ports1/tailor/-/archive/0.937/tailor-0.937.tar.gz";
-    hash = "sha256-Bdf8ZCRsbCsFz1GRxyQxxndXSsm8oOL2738m9UxOTVc=";
-  };
-
-  propagatedBuildInputs = with python3.pkgs; [
-    future
-  ];
-
-  # AssertionError: Tailor Darcs repository not found!
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Tool to migrate changesets between various kinds of version control system";
-    longDescription = ''
-      With its ability to "translate the history" from one VCS kind to another,
-      this tool makes it easier to keep the upstream changes merged in
-      a own branch of a product.
-
-      Tailor is able to fetch the history from Arch, Bazaar, CVS, Darcs, Monotone,
-      Perforce or Subversion and rewrite it over Aegis, Bazaar, CVS, Darcs, Git,
-      Mercurial, Monotone and Subversion.
-    '';
-    homepage = "https://gitlab.com/ports1/tailor";
-    license = licenses.gpl1Plus;
-    platforms = platforms.unix;
-    mainProgram = "tailor";
-  };
-}
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@ -15,13 +15,13 @@

 buildGoModule rec {
  pname = "cri-o";
-  version = "1.31.1";
+  version = "1.31.2";

  src = fetchFromGitHub {
    owner = "cri-o";
    repo = "cri-o";
    rev = "v${version}";
-    hash = "sha256-0IPQsCLiL0Q15pq89qToMfw6mDwmMZroNBkTCfgqx6s=";
+    hash = "sha256-xTMQ7YVZ4tKQxaAsH9EVa7W2rTcxP//P3NUgYHojdmw=";
  };
  vendorHash = null;

--- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
+++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
@ -97,7 +97,7 @@ let
    # Following XDG spec [1], XDG_DATA_DIRS should default to "/usr/local/share:/usr/share".
    # In nix, it is commonly set without containing these values, so we add them as fallback.
    #
-    # [1] <https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html>
+    # [1] <https://specifications.freedesktop.org/basedir-spec/latest>
    case ":$XDG_DATA_DIRS:" in
      *:/usr/local/share:*) ;;
      *) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/local/share" ;;
--- a/pkgs/build-support/build-fhsenv-chroot/env.nix
+++ b/pkgs/build-support/build-fhsenv-chroot/env.nix
@ -67,7 +67,7 @@ let
    # Following XDG spec [1], XDG_DATA_DIRS should default to "/usr/local/share:/usr/share".
    # In nix, it is commonly set without containing these values, so we add them as fallback.
    #
-    # [1] <https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html>
+    # [1] <https://specifications.freedesktop.org/basedir-spec/latest>
    case ":$XDG_DATA_DIRS:" in
      *:/usr/local/share:*) ;;
      *) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/local/share" ;;
--- a/pkgs/build-support/make-desktopitem/default.nix
+++ b/pkgs/build-support/make-desktopitem/default.nix
@ -3,7 +3,7 @@
 # All possible values as defined by the spec, version 1.4.
 # Please keep in spec order for easier maintenance.
 # When adding a new value, don't forget to update the Version field below!
-# See https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html
+# See https://specifications.freedesktop.org/desktop-entry-spec/latest
 lib.makeOverridable ({ name # The name of the desktop file
 , type ? "Application"
 # version is hardcoded
--- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh
+++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh
@ -37,7 +37,7 @@ convertIconTheme() {
    local -ra scales=([1]="" [2]="@2")

    # Based loosely on the algorithm at:
-    # https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#icon_lookup
+    # https://specifications.freedesktop.org/icon-theme-spec/latest/#icon_lookup
    # Assumes threshold = 2 for ease of implementation.
    function findIcon() {
        local -r iconSize=$1
--- a/pkgs/by-name/_6/_64gram/package.nix
+++ b/pkgs/by-name/_6/_64gram/package.nix
@ -41,7 +41,6 @@ telegram-desktop.overrideAttrs (old: rec {
    homepage = "https://github.com/TDesktop-x64/tdesktop";
    changelog = "https://github.com/TDesktop-x64/tdesktop/releases/tag/v${version}";
    maintainers = with maintainers; [ clot27 ];
-    mainProgram = "telegram-desktop";
-    broken = stdenv.hostPlatform.isDarwin;
+    mainProgram = if stdenv.hostPlatform.isLinux then "telegram-desktop" else "Telegram";
  };
 })
--- a/pkgs/by-name/dc/dcw-gmt/package.nix
+++ b/pkgs/by-name/dc/dcw-gmt/package.nix
@ -1,10 +1,14 @@
-{ lib, stdenv, fetchurl }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+}:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "dcw-gmt";
  version = "2.1.2";
  src = fetchurl {
-    url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${version}.tar.gz";
+    url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${finalAttrs.version}.tar.gz";
    sha256 = "sha256-S7hA0HXIuj4UrrQc8XwkI2v/eHVmMU+f91irmXd0XZk=";
  };

@ -29,4 +33,4 @@ stdenv.mkDerivation rec {
    maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]);
  };

-}
+})
--- a/pkgs/by-name/de/devtoolbox/package.nix
+++ b/pkgs/by-name/de/devtoolbox/package.nix
@ -0,0 +1,118 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  gobject-introspection,
+  blueprint-compiler,
+  wrapGAppsHook4,
+  desktop-file-utils,
+  libadwaita,
+  gtksourceview5,
+  webkitgtk_6_0,
+  gcr_4,
+  gdk-pixbuf,
+}:
+python3Packages.buildPythonApplication rec {
+  pname = "devtoolbox";
+  version = "1.2";
+  pyproject = false; # uses meson
+
+  src = fetchFromGitHub {
+    owner = "aleiepure";
+    repo = "devtoolbox";
+    rev = "v${version}";
+    hash = "sha256-tSH7H2Y/+8EpuM4+Fa0iL/pSJSVtFDXlO2w/xwpzps0=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gobject-introspection
+    blueprint-compiler
+    wrapGAppsHook4
+    desktop-file-utils
+  ];
+
+  buildInputs = [
+    libadwaita
+    gtksourceview5
+    webkitgtk_6_0
+    gcr_4
+    gdk-pixbuf
+  ];
+
+  dependencies = with python3Packages; [
+    pygobject3
+    ruamel-yaml
+    lxml
+    python-crontab
+    jwt
+    jsonschema
+    pytz
+    tzlocal
+    python-lorem
+    uuid6
+    textstat
+    markdown2
+    daltonlens
+    asn1crypto
+    qrcode
+    sqlparse
+    jsbeautifier
+    cssbeautifier
+    humanize
+    croniter
+    python-dateutil
+    rcssmin
+    rjsmin
+  ];
+
+  dontWrapGApps = true;
+
+  # Contains an unusable devtoolbox-run-script
+  postInstall = ''
+    rm -r $out/devtoolbox
+  '';
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  meta = {
+    description = "Development tools at your fingertips";
+    longDescription = ''
+      If you're tired of endlessly looking online for the right
+      tool, or to find again that website of which you don't
+      recall the name to do a quick conversion, this is the
+      right app for you. This is a collection of powerful yet
+      simple-to-use tools and utilities to solve the most common
+      daily development problems:
+      - JSON to YAML converter and vice-versa
+      - CRON expressions parser
+      - Formatters for common languages
+      - Hash generators
+      - Regex tester
+      - Markdown Previewer
+      - Image converters
+      - Much more...
+    '';
+    homepage = "https://github.com/aleiepure/devtoolbox";
+    license = with lib.licenses; [
+      gpl3Plus
+      cc0
+      lgpl3Only
+      mit
+      unlicense
+    ];
+    mainProgram = "devtoolbox";
+    maintainers = with lib.maintainers; [
+      aleksana
+      aucub
+    ];
+    platforms = lib.platforms.linux;
+  };
+}
--- a/pkgs/by-name/di/distrho-ports/package.nix
+++ b/pkgs/by-name/di/distrho-ports/package.nix
@ -0,0 +1,113 @@
+{
+  lib,
+  stdenv,
+  alsa-lib,
+  fetchFromGitHub,
+  fftwFloat,
+  freetype,
+  libGL,
+  libX11,
+  libXcursor,
+  libXext,
+  libXrender,
+  meson,
+  ninja,
+  pkg-config,
+}:
+
+let
+  rpathLibs = [
+    fftwFloat
+  ];
+in
+stdenv.mkDerivation {
+  pname = "distrho-ports";
+  version = "2021-03-15-unstable-2024-05-01";
+
+  src = fetchFromGitHub {
+    owner = "DISTRHO";
+    repo = "DISTRHO-Ports";
+    rev = "b3596e6a690eb0556e69e8b6d943fee2dfbb04fb";
+    sha256 = "00fgqwayd20akww3n2imyqscmyrjyc9jj0ar13k9dhpaxqk2jxbf";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    meson
+    ninja
+  ];
+
+  buildInputs = rpathLibs ++ [
+    alsa-lib
+    freetype
+    libGL
+    libX11
+    libXcursor
+    libXext
+    libXrender
+  ];
+
+  env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ];
+
+  postFixup = ''
+    for file in \
+      $out/lib/lv2/vitalium.lv2/vitalium.so \
+      $out/lib/vst/vitalium.so \
+      $out/lib/vst3/vitalium.vst3/Contents/x86_64-linux/vitalium.so
+    do
+      patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $file)" $file
+    done
+  '';
+
+  meta = {
+    homepage = "http://distrho.sourceforge.net/ports";
+    description = "Linux audio plugins and LV2 ports";
+    longDescription = ''
+      Includes:
+      - arctican-function
+      - arctican-pilgrim
+      - dexed
+      - drowaudio-distortion
+      - drowaudio-distortionshaper
+      - drowaudio-flanger
+      - drowaudio-reverb
+      - drowaudio-tremolo
+      - drumsynth
+      - easySSP
+      - eqinox
+      - HiReSam
+      - juce-opl
+      - klangfalter
+      - LUFSMeter
+      - LUFSMeter-Multi
+      - luftikus
+      - obxd
+      - pitchedDelay
+      - refine
+      - stereosourceseparation
+      - swankyamp
+      - tal-dub-3
+      - tal-filter
+      - tal-filter-2
+      - tal-noisemaker
+      - tal-reverb
+      - tal-reverb-2
+      - tal-reverb-3
+      - tal-vocoder-2
+      - temper
+      - vex
+      - vitalium
+      - wolpertinger
+    '';
+    license = with lib.licenses; [
+      gpl2Only
+      gpl3Only
+      gpl2Plus
+      lgpl2Plus
+      lgpl3Only
+      mit
+    ];
+    maintainers = [ ];
+    platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isLinux lib.systems.inspect.patterns.isx86;
+  };
+}
--- a/pkgs/by-name/do/dosbox-staging/package.nix
+++ b/pkgs/by-name/do/dosbox-staging/package.nix
@ -4,7 +4,6 @@
  SDL2_image,
  SDL2_net,
  alsa-lib,
-  darwin,
  fetchFromGitHub,
  fetchpatch,
  fluidsynth,
@ -30,6 +29,8 @@
  stdenv,
  testers,
  zlib-ng,
+  apple-sdk_15,
+  darwinMinVersionHook,
 }:

 stdenv.mkDerivation (finalAttrs: {
@ -81,14 +82,10 @@ stdenv.mkDerivation (finalAttrs: {
      zlib-ng
    ]
    ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (
-      with darwin.apple_sdk.frameworks;
-      [
-        AudioUnit
-        Carbon
-        Cocoa
-      ]
-    );
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      apple-sdk_15
+      (darwinMinVersionHook "10.15") # from https://www.dosbox-staging.org/releases/macos/
+    ];

  outputs = [ "out" "man" ];

--- a/pkgs/by-name/eg/eg25-manager/package.nix
+++ b/pkgs/by-name/eg/eg25-manager/package.nix
@ -17,13 +17,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "eg25-manager";
-  version = "0.5.0";
+  version = "0.5.2";

  src = fetchFromGitLab {
    owner = "mobian1";
    repo = "eg25-manager";
    rev = finalAttrs.version;
-    hash = "sha256-hOOYrEM+W7nHc6AQMYg6XQj4dgkLoBQe9S1F65TWPUI=";
+    hash = "sha256-Zna+JplmYrxPYsXToJ3vKOPzPMZYB3bEdfT8GIAHATs=";
  };

  postPatch = ''
--- a/pkgs/by-name/ej/ejabberd/package.nix
+++ b/pkgs/by-name/ej/ejabberd/package.nix
@ -115,7 +115,7 @@ let
        buildInputs = [ sqlite ];
        buildPlugins = [ beamPackages.pc ];
      };
-      p1_mysql = prev.p1_acme.override { buildPlugins = [ beamPackages.pc ]; };
+      p1_mysql = prev.p1_mysql.override { buildPlugins = [ beamPackages.pc ]; };
      epam = prev.epam.override {
        buildInputs = [ pam ];
        buildPlugins = [ beamPackages.pc ];
--- a/pkgs/by-name/fa/factorio/versions.json
+++ b/pkgs/by-name/fa/factorio/versions.json
@ -14,14 +14,14 @@
      },
      "stable": {
        "candidateHashFilenames": [
-          "factorio_linux_2.0.13.tar.xz"
+          "factorio_linux_2.0.14.tar.xz"
        ],
-        "name": "factorio_alpha_x64-2.0.13.tar.xz",
+        "name": "factorio_alpha_x64-2.0.14.tar.xz",
        "needsAuth": true,
-        "sha256": "25fc4c8b0c0b63d8024e1e76efda50e6f8348e967e03c2770eb8a867494b9c98",
+        "sha256": "8853ce1cdea0c142f78c3ebb3b7d51420f9eb28e9113f2be08a12d4e476dcadc",
        "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.13/alpha/linux64",
-        "version": "2.0.13"
+        "url": "https://factorio.com/get-download/2.0.14/alpha/linux64",
+        "version": "2.0.14"
      }
    },
    "demo": {
@ -62,14 +62,14 @@
      },
      "stable": {
        "candidateHashFilenames": [
-          "factorio-space-age_linux_2.0.13.tar.xz"
+          "factorio-space-age_linux_2.0.14.tar.xz"
        ],
-        "name": "factorio_expansion_x64-2.0.13.tar.xz",
+        "name": "factorio_expansion_x64-2.0.14.tar.xz",
        "needsAuth": true,
-        "sha256": "5834dc11791aa24c0edc6ecfdd223f80af9c6842c39be0fb8c3b188463ec0f54",
+        "sha256": "7878444d65dc12815d7ce4d2c941441b8b7e05605e3f0bd69d45d02b3aa8f81a",
        "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.13/expansion/linux64",
-        "version": "2.0.13"
+        "url": "https://factorio.com/get-download/2.0.14/expansion/linux64",
+        "version": "2.0.14"
      }
    },
    "headless": {
@ -87,15 +87,15 @@
      },
      "stable": {
        "candidateHashFilenames": [
-          "factorio-headless_linux_2.0.13.tar.xz",
-          "factorio_headless_x64_2.0.13.tar.xz"
+          "factorio-headless_linux_2.0.14.tar.xz",
+          "factorio_headless_x64_2.0.14.tar.xz"
        ],
-        "name": "factorio_headless_x64-2.0.13.tar.xz",
+        "name": "factorio_headless_x64-2.0.14.tar.xz",
        "needsAuth": false,
-        "sha256": "27b36901a39e593adf28418c0286142c6c7a9f83d156963c7369bd405a25c7d1",
+        "sha256": "5a4bc4c3b2a97ed1fc58eb796321e848dcc64435bd91013dd9c78a14a8ce8815",
        "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.13/headless/linux64",
-        "version": "2.0.13"
+        "url": "https://factorio.com/get-download/2.0.14/headless/linux64",
+        "version": "2.0.14"
      }
    }
  }
--- a/pkgs/by-name/fl/flashmq/package.nix
+++ b/pkgs/by-name/fl/flashmq/package.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "flashmq";
-  version = "1.17.1";
+  version = "1.17.2";

  src = fetchFromGitHub {
    owner = "halfgaar";
    repo = "FlashMQ";
    rev = "v${version}";
-    hash = "sha256-T9ecw+UHe/DM8TSDda140lxG3oaf/wf+TEySOz6tboA=";
+    hash = "sha256-9PZ0niX7VQzoJ6JE50NOU2es8PyBt7ECENvr2lDpb7Y=";
  };

  nativeBuildInputs = [ cmake installShellFiles ];
--- a/pkgs/by-name/fr/frozen-bubble/fix-compilation.patch
+++ b/pkgs/by-name/fr/frozen-bubble/fix-compilation.patch
--- a/pkgs/by-name/fr/frozen-bubble/package.nix
+++ b/pkgs/by-name/fr/frozen-bubble/package.nix
@ -0,0 +1,74 @@
+{
+  lib,
+  fetchurl,
+  perlPackages,
+  pkg-config,
+  SDL,
+  SDL_mixer,
+  SDL_Pango,
+  glib,
+  copyDesktopItems,
+  makeDesktopItem,
+  fetchpatch,
+}:
+
+perlPackages.buildPerlModule {
+  pname = "frozen-bubble";
+  version = "2.212";
+
+  src = fetchurl {
+    url = "mirror://cpan/authors/id/K/KT/KTHAKORE/Games-FrozenBubble-2.212.tar.gz";
+    hash = "sha256-ch4E/2nFIzBgZWv79AAqoa6t2WyVNR8MV7uFtto1owU=";
+  };
+
+  patches = [
+    ./fix-compilation.patch
+    (fetchpatch {
+      # https://github.com/kthakore/frozen-bubble/pull/82
+      url = "https://github.com/kthakore/frozen-bubble/commit/1aacc67254a0aafd856086cc306e9f7b389c6bf4.patch?full_index=1";
+      hash = "sha256-RqJ+/UFv4esKWZBk0fttsEXhPMislEBTAl2oj4pLAZY=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    copyDesktopItems
+    pkg-config
+  ];
+
+  buildInputs = [
+    glib
+    SDL
+    SDL_mixer
+    SDL_Pango
+    perlPackages.SDL
+    perlPackages.FileSlurp
+  ];
+
+  propagatedBuildInputs = with perlPackages; [
+    AlienSDL
+    CompressBzip2
+    FileShareDir
+    FileWhich
+    IPCSystemSimple
+    LocaleMaketextLexicon
+  ];
+
+  perlPreHook = "export LD=$CC";
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "frozen-bubble";
+      exec = "frozen-bubble";
+      desktopName = "Frozen Bubble";
+      genericName = "Frozen Bubble";
+      comment = "Arcade/reflex colour matching game";
+      categories = [ "Game" ];
+    })
+  ];
+
+  meta = {
+    description = "Puzzle with Bubbles";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ puckipedia ];
+  };
+}
--- a/pkgs/by-name/gh/ghbackup/package.nix
+++ b/pkgs/by-name/gh/ghbackup/package.nix
@ -0,0 +1,44 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  git,
+  makeWrapper,
+}:
+
+buildGoModule rec {
+  pname = "ghbackup";
+  version = "1.13.0";
+
+  src = fetchFromGitHub {
+    owner = "qvl";
+    repo = "ghbackup";
+    rev = "v${version}";
+    hash = "sha256-3LSe805VrbUGjqjnhTJD2KBVZ4rq+4Z3l4d0I1MrBMA=";
+  };
+
+  patches = [ ./patches/fix-next-page-logic.patch ];
+
+  postPatch = ''
+    go mod init qvl.io/ghbackup
+  '';
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  vendorHash = null;
+
+  postFixup = ''
+    wrapProgram $out/bin/${meta.mainProgram} \
+      --prefix PATH : "${lib.makeBinPath [ git ]}"
+  '';
+
+  doCheck = false; # tests want to actually download from github
+
+  meta = with lib; {
+    description = "Backup your GitHub repositories with a simple command-line application written in Go.";
+    homepage = "https://github.com/qvl/ghbackup";
+    license = licenses.mit;
+    mainProgram = "ghbackup";
+    maintainers = with maintainers; [ lenny ];
+  };
+}
--- a/pkgs/by-name/gh/ghbackup/patches/fix-next-page-logic.patch
+++ b/pkgs/by-name/gh/ghbackup/patches/fix-next-page-logic.patch
@ -0,0 +1,66 @@
+From 9825efc51387fef14fdb184e7061b313a54fcb86 Mon Sep 17 00:00:00 2001
+From: Ronan Barrett <ronan.barrett@voiapp.io>
+Date: Mon, 8 May 2023 15:54:39 +0200
+Subject: [PATCH 1/2] fix next page logic
+
+---
+ ghbackup/fetch.go | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/ghbackup/fetch.go b/ghbackup/fetch.go
+index 93cce1c..bcef8ad 100644
+--- a/ghbackup/fetch.go
+++ b/ghbackup/fetch.go
+@@ -126,11 +126,17 @@ func getNextURL(header http.Header) string {
+ 	if len(parts) == 0 {
+ 		return ""
+ 	}
+-	firstLink := parts[0]
+-	if !strings.Contains(firstLink, "rel=\"next\"") {
+	var nextLink string
+	for _, v := range parts {
+		if strings.Contains(v, "rel=\"next\"") {
+			nextLink = strings.TrimSpace(v)
+		}
+	}
+	if nextLink == "" {
+ 		return ""
+ 	}
+-	parts = strings.Split(firstLink, ";")
+
+	parts = strings.Split(nextLink, ";")
+ 	if len(parts) == 0 {
+ 		return ""
+ 	}
+@@ -140,3 +146,4 @@ func getNextURL(header http.Header) string {
+ 	}
+ 	return urlInBrackets[1 : len(urlInBrackets)-1]
+ }
+
+
+From 5f696939f668cd88c59c05fd8e0d6ad9f236dea5 Mon Sep 17 00:00:00 2001
+From: Ronan Barrett <ronan.barrett@voiapp.io>
+Date: Mon, 8 May 2023 16:44:47 +0200
+Subject: [PATCH 2/2] add break
+
+---
+ ghbackup/fetch.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ghbackup/fetch.go b/ghbackup/fetch.go
+index bcef8ad..b045c38 100644
+--- a/ghbackup/fetch.go
+++ b/ghbackup/fetch.go
+@@ -130,6 +130,7 @@ func getNextURL(header http.Header) string {
+ 	for _, v := range parts {
+ 		if strings.Contains(v, "rel=\"next\"") {
+ 			nextLink = strings.TrimSpace(v)
+			break
+ 		}
+ 	}
+ 	if nextLink == "" {
+@@ -146,4 +147,3 @@ func getNextURL(header http.Header) string {
+ 	}
+ 	return urlInBrackets[1 : len(urlInBrackets)-1]
+ }
+-
--- a/pkgs/by-name/gm/gmt/package.nix
+++ b/pkgs/by-name/gm/gmt/package.nix
@ -0,0 +1,108 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  curl,
+  darwin,
+  fftwSinglePrec,
+  netcdf,
+  pcre,
+  gdal,
+  blas,
+  lapack,
+  ghostscript,
+  dcw-gmt,
+  gshhg-gmt,
+  libxml2,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gmt";
+  version = "6.5.0";
+
+  src = fetchFromGitHub {
+    owner = "GenericMappingTools";
+    repo = "gmt";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-KKIYhljCtk9t9CuvTLsSGvUkUwazWTm9ymBB3wLwSoI=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  env = {
+    NIX_LDFLAGS = "-lxml2 -L${lib.getLib (libxml2.override { enableHttp = true; })}/lib";
+    NIX_CFLAGS_COMPILE =
+      lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration "
+      + lib.optionalString (
+        stdenv.isDarwin
+        && lib.versionOlder (darwin.apple_sdk.MacOSX-SDK.version or darwin.apple_sdk.sdk.version) "13.3"
+      ) "-D__LAPACK_int=int";
+  };
+
+  buildInputs =
+    [
+      curl
+      gdal
+      netcdf
+      pcre
+      dcw-gmt
+      gshhg-gmt
+    ]
+    ++ (
+      if stdenv.isDarwin then
+        with darwin.apple_sdk.frameworks;
+        [
+          Accelerate
+          CoreGraphics
+          CoreVideo
+        ]
+      else
+        [
+          fftwSinglePrec
+          blas
+          lapack
+        ]
+    );
+
+  propagatedBuildInputs = [ ghostscript ];
+
+  cmakeFlags =
+    [
+      (lib.cmakeFeature "GMT_DOCDIR" "share/doc/gmt")
+      (lib.cmakeFeature "GMT_MANDIR" "share/man")
+      (lib.cmakeFeature "GMT_LIBDIR" "lib")
+      (lib.cmakeBool "COPY_GSHHG" false)
+      (lib.cmakeFeature "GSHHG_ROOT" "${gshhg-gmt.out}/share/gshhg-gmt")
+      (lib.cmakeBool "COPY_DCW" false)
+      (lib.cmakeFeature "DCW_ROOT" "${dcw-gmt.out}/share/dcw-gmt")
+      (lib.cmakeFeature "GDAL_ROOT" "${gdal.out}")
+      (lib.cmakeFeature "NETCDF_ROOT" "${netcdf.out}")
+      (lib.cmakeFeature "PCRE_ROOT" "${pcre.out}")
+      (lib.cmakeBool "GMT_INSTALL_TRADITIONAL_FOLDERNAMES" false)
+      (lib.cmakeBool "GMT_ENABLE_OPENMP" true)
+      (lib.cmakeBool "GMT_INSTALL_MODULE_LINKS" false)
+      (lib.cmakeFeature "LICENSE_RESTRICTED" "LGPL")
+    ]
+    ++ (lib.optionals (!stdenv.isDarwin) [
+      (lib.cmakeFeature "FFTW3_ROOT" "${fftwSinglePrec.dev}")
+      (lib.cmakeFeature "LAPACK_LIBRARY" "${lib.getLib lapack}/lib/liblapack.so")
+      (lib.cmakeFeature "BLAS_LIBRARY" "${lib.getLib blas}/lib/libblas.so")
+    ]);
+
+  meta = {
+    homepage = "https://www.generic-mapping-tools.org";
+    description = "Tools for manipulating geographic and cartesian data sets";
+    longDescription = ''
+      GMT is an open-source collection of command-line tools for manipulating
+      geographic and Cartesian data sets (including filtering, trend fitting,
+      gridding, projecting, etc.) and producing high-quality illustrations
+      ranging from simple x–y plots via contour maps to artificially illuminated
+      surfaces and 3D perspective views. It supports many map projections and
+      transformations and includes supporting data such as coastlines, rivers,
+      and political boundaries and optionally country polygons.
+    '';
+    platforms = lib.platforms.unix;
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ tviti ];
+  };
+})
--- a/pkgs/by-name/go/go-chromecast/package.nix
+++ b/pkgs/by-name/go/go-chromecast/package.nix
@ -1,25 +1,24 @@
 {
  lib,
-  buildGo122Module,
+  buildGoModule,
  fetchFromGitHub,
  installShellFiles,
  stdenvNoCC,
  versionCheckHook,
 }:

-# "go test" fails with go 1.23
-buildGo122Module rec {
+buildGoModule rec {
  pname = "go-chromecast";
-  version = "0.3.1";
+  version = "0.3.2";

  src = fetchFromGitHub {
    owner = "vishen";
    repo = "go-chromecast";
    rev = "refs/tags/v${version}";
-    hash = "sha256-Kzo8iWj4mtnX1Jxm2sLsnmEOmpzScxWHZ/sLYYm3vQI=";
+    hash = "sha256-R1VGgustsKRoVZFiH2wuYRRSOolWIYq33H0DyQXHDvg=";
  };

-  vendorHash = "sha256-cEUlCR/xtPJJSWplV1COwV6UfzSmVArF4V0pJRk+/Og=";
+  vendorHash = "sha256-EI37KPdNxPXdgmxvawTiRQ516dLxt5o0iYvGcAHXdUw=";

  CGO_ENABLED = 0;

--- a/pkgs/by-name/gs/gshhg-gmt/package.nix
+++ b/pkgs/by-name/gs/gshhg-gmt/package.nix
@ -1,10 +1,14 @@
-{ lib, stdenv, fetchurl }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+}:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "gshhg-gmt";
  version = "2.3.7";
  src = fetchurl {
-    url = "ftp://ftp.soest.hawaii.edu/gmt/gshhg-gmt-${version}.tar.gz";
+    url = "ftp://ftp.soest.hawaii.edu/gmt/gshhg-gmt-${finalAttrs.version}.tar.gz";
    sha256 = "9bb1a956fca0718c083bef842e625797535a00ce81f175df08b042c2a92cfe7f";
  };

@ -28,4 +32,4 @@ stdenv.mkDerivation rec {
    maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]);
  };

-}
+})
--- a/pkgs/by-name/hy/hyprland-activewindow/package.nix
+++ b/pkgs/by-name/hy/hyprland-activewindow/package.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "hyprland-activewindow";
-  version = "1.0.4";
+  version = "1.0.5";

  src = fetchFromGitHub {
    owner = "FieldOfClay";
    repo = "hyprland-activewindow";
    rev = "v${version}";
-    hash = "sha256-2pIOZMBPqheqAz3YEvHP2ehLXhqIclOXXAFa5EXXZPk=";
+    hash = "sha256-oH3BsS0KqnNdYe7HWHlfRSiUJx+vC3IveN+mcEgwZLs=";
  };

-  cargoHash = "sha256-5JhNBgP6VQX7TVPaFUGvknDWrn6F06Mm3mGfuajg9yQ=";
+  cargoHash = "sha256-B9ZOz4U6tvUfFzI5pOuhazTZJH89jpxwRc+tbfNEZAk=";

  meta = with lib; {
    description = "Multi-monitor-aware Hyprland workspace widget helper";
--- a/pkgs/by-name/hy/hyprland-workspaces/package.nix
+++ b/pkgs/by-name/hy/hyprland-workspaces/package.nix
@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "hyprland-workspaces";
-  version = "2.0.2";
+  version = "2.0.3";

  src = fetchFromGitHub {
    owner = "FieldofClay";
    repo = "hyprland-workspaces";
    rev = "v${version}";
-    hash = "sha256-cTIh/UwtVVAWdJEcwOxKmYHBA6XXAaAQz/yW0Xs0y1k=";
+    hash = "sha256-P+EJoZJqSlpMX1bWOkQYlKR577nTTe1luWKK5GS9Pn4=";
  };

-  cargoHash = "sha256-NPphNQ2FLUrYLbquc2IzxuEjfmov+IPa1ixS6VGomPs=";
+  cargoHash = "sha256-vUlr12K/vYJE+HlSgulE2aSowU+pT9VPCaCp7Ix9ChM=";

  meta = with lib; {
    description = "Multi-monitor aware Hyprland workspace widget";
--- a/pkgs/by-name/la/labwc/package.nix
+++ b/pkgs/by-name/la/labwc/package.nix
@ -8,6 +8,7 @@
  libinput,
  libpng,
  librsvg,
+  libsfdo,
  libxcb,
  libxkbcommon,
  libxml2,
@ -17,6 +18,7 @@
  pkg-config,
  scdoc,
  stdenv,
+  versionCheckHook,
  wayland,
  wayland-protocols,
  wayland-scanner,
@ -27,13 +29,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "labwc";
-  version = "0.8.0";
+  version = "0.8.1";

  src = fetchFromGitHub {
    owner = "labwc";
    repo = "labwc";
    rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-1PyPk6r/hXkC0EfOIeDqNGrrpvo616derD9u7i3XjkA=";
+    hash = "sha256-TXxdjMkzZQoCqkZBqus5eCBEhA/nvxNNXaNHUTGFQDQ=";
  };

  outputs = [
@ -58,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
    libinput
    libpng
    librsvg
+    libsfdo
    libxcb
    libxkbcommon
    libxml2
@ -69,10 +72,15 @@ stdenv.mkDerivation (finalAttrs: {
    xwayland
  ];

+  nativeInstallCheckInputs = [ versionCheckHook ];
+
  mesonFlags = [ (lib.mesonEnable "xwayland" true) ];

  strictDeps = true;

+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+
  passthru = {
    providedSessions = [ "labwc" ];
  };
@ -80,6 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
  meta = {
    homepage = "https://github.com/labwc/labwc";
    description = "Wayland stacking compositor, inspired by Openbox";
+    changelog = "https://github.com/labwc/labwc/blob/master/NEWS.md";
    license = with lib.licenses; [ gpl2Plus ];
    mainProgram = "labwc";
    maintainers = with lib.maintainers; [ AndersonTorres ];
--- a/pkgs/by-name/li/libsfdo/package.nix
+++ b/pkgs/by-name/li/libsfdo/package.nix
@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  meson,
+  ninja,
+  pkg-config,
+  testers,
+  validatePkgConfig,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libsfdo";
+  version = "0.1.3";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = "vyivel";
+    repo = "libsfdo";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-9jCfCIB07mmJ6aWQHvXaxYhEMNikUw/W1xrpmh6FKbo=";
+  };
+
+  strictDeps = true;
+  doCheck = true;
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    validatePkgConfig
+  ];
+
+  passthru.tests.pkg-config = testers.hasPkgConfigModules {
+    package = finalAttrs.finalPackage;
+    versionCheck = true;
+  };
+
+  meta = {
+    description = "Collection of libraries which implement some of the freedesktop.org specifications";
+    homepage = "https://gitlab.freedesktop.org/vyivel/libsfdo";
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.zi3m5f ];
+    pkgConfigModules = [
+      "libsfdo-basedir"
+      "libsfdo-desktop-file"
+      "libsfdo-desktop"
+      "libsfdo-icon"
+    ];
+    platforms = lib.platforms.all;
+  };
+})
--- a/pkgs/by-name/li/libsnark/package.nix
+++ b/pkgs/by-name/li/libsnark/package.nix
@ -0,0 +1,50 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  openssl,
+  boost,
+  gmp,
+  withProcps ? false,
+  procps,
+}:
+
+stdenv.mkDerivation {
+  pname = "libsnark";
+  version = "20140603-unstable-2024-02-23";
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+  buildInputs = [
+    openssl
+    boost
+    gmp
+  ] ++ lib.optional withProcps procps;
+
+  cmakeFlags =
+    lib.optionals (!withProcps) [ "-DWITH_PROCPS=OFF" ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin || !stdenv.hostPlatform.isx86) [
+      "-DWITH_SUPERCOP=OFF"
+    ]
+    ++ lib.optionals (!stdenv.hostPlatform.isx86) [ "-DCURVE=ALT_BN128" ];
+
+  src = fetchFromGitHub {
+    owner = "scipr-lab";
+    repo = "libsnark";
+    rev = "6c705e3135f585c222813654caedc86520fda1f6";
+    hash = "sha256-5Gk24fwVaXBWEFmhTsN9Qm8x/Qpr1KjavI3staJidxQ=";
+    fetchSubmodules = true;
+  };
+
+  meta = {
+    broken = withProcps; # Despite procps having a valid pkg-config file, CMake doesn't seem to be able to find it.
+    description = "C++ library for zkSNARKs";
+    homepage = "https://github.com/scipr-lab/libsnark";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+  };
+}
--- a/pkgs/by-name/me/melodeon/package.nix
+++ b/pkgs/by-name/me/melodeon/package.nix
@ -8,13 +8,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "melodeon";
-  version = "0.4.1";
+  version = "0.4.2";

  src = fetchFromGitHub {
    owner = "CDrummond";
    repo = "melodeon";
    rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-k74iJ3tmkMGUh4f538tjD7cv4ZXxm3x6M/d5HU25yPQ=";
+    hash = "sha256-CwJd77FAEcfCvxHeh3V1SIsgSam3S5WtpSLj9WrOOyI=";
    fetchSubmodules = true;
  };

--- a/pkgs/by-name/mu/music-player/package.nix
+++ b/pkgs/by-name/mu/music-player/package.nix
@ -11,17 +11,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "music-player";
-  version = "0.2.0-alpha.14-unstable-2024-08-24";
+  version = "0.2.0-alpha.14-unstable-2024-10-02";

  src = fetchFromGitHub {
    owner = "tsirysndr";
    repo = "music-player";
-    # No patch for 0.2.0, diff patch has a big size, temporarily until the next release
-    rev = "cf01ae4d2dcf5c804559250f2c7f922d870ae26d";
-    hash = "sha256-8C8uFnXSBalLD2MUgzzfg4ylvTVecyPJOSUri5jbvkM=";
+    rev = "cbf03c3f2f0f9baca831b08ec27d9b31438faa3d";
+    hash = "sha256-BG0MU6IdFQX+C4BxTZlq5I7a4BQmUTvwAQALw5/UPBE=";
  };

-  cargoHash = "sha256-JmyuA5p6/7jtNuOMWuAuspYYid+dGOeollIlS0DRCIE=";
+  cargoHash = "sha256-t/jdVTdmaJk8Sb43XEuVCKa4kSR+ZrIEmMQKWeVpB70=";

  nativeBuildInputs =
    [
@ -40,11 +39,11 @@ rustPlatform.buildRustPackage rec {
      darwin.apple_sdk.frameworks.AudioUnit
    ];

-  meta = with lib; {
+  meta = {
    description = "Extensible music player daemon written in Rust";
    homepage = "https://github.com/tsirysndr/music-player";
    changelog = "https://github.com/tsirysndr/music-player/releases/tag/v${version}";
-    license = licenses.mit;
+    license = lib.licenses.mit;
    maintainers = [ ];
    mainProgram = "music-player";
  };
--- a/pkgs/by-name/my/mysql84/package.nix
+++ b/pkgs/by-name/my/mysql84/package.nix
@ -5,11 +5,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "mysql";
-  version = "8.4.2";
+  version = "8.4.3";

  src = fetchurl {
    url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
-    hash = "sha256-Vlenjchr8L8iJ+CwX43losRHqBahEv+ib6cAg7y+mBQ=";
+    hash = "sha256-eslWTEeAIvcwBf+Ju7QPZ7OB/AbVUYQWvf/sdeYluBg=";
  };

  nativeBuildInputs = [ bison cmake pkg-config ]
--- a/pkgs/by-name/oi/oidc-agent/package.nix
+++ b/pkgs/by-name/oi/oidc-agent/package.nix
@ -15,13 +15,13 @@

 stdenv.mkDerivation rec {
  pname = "oidc-agent";
-  version = "5.2.2";
+  version = "5.2.3";

  src = fetchFromGitHub {
    owner = "indigo-dc";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-OW0hCDVC+AqmXP1dQK/7lnXeG8RbXzFLbKLEvc/8spY=";
+    hash = "sha256-Vj/YoZpbiV8psU70i3SIKJM/qPQYuy96ogEhT8cG7RU=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/pa/parallel-disk-usage/package.nix
+++ b/pkgs/by-name/pa/parallel-disk-usage/package.nix
@ -4,16 +4,16 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "parallel-disk-usage";
-  version = "0.9.3";
+  version = "0.10.0";

  src = fetchFromGitHub {
    owner = "KSXGitHub";
    repo = pname;
    rev = version;
-    hash = "sha256-2w+A2ZpmLPBSj9odGh8QWAadE6e2XPJmBZwl6ZT6bSc=";
+    hash = "sha256-BeTidzXcCSe2IEXHAPpG9ZZJV/l/g09gtlZ9JNOuvsw=";
  };

-  cargoHash = "sha256-WwWNAF0iKFZJ8anvXUJwXo8xw5pCNVO7RcAMyA1R4wE=";
+  cargoHash = "sha256-rATv8Bg9g2vVyTWCjGPaBtvVgtqQCSs/RurvKmafG/8=";

  meta = with lib; {
    description = "Highly parallelized, blazing fast directory tree analyzer";
--- a/pkgs/by-name/sl/slweb/package.nix
+++ b/pkgs/by-name/sl/slweb/package.nix
@ -7,13 +7,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "slweb";
-  version = "0.10.1";
+  version = "0.10.2";

  src = fetchFromSourcehut {
    owner = "~strahinja";
    repo = "slweb";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-AJg8qgbNUKizU0uyTnq9EviIXOUuaGvQowLAyTWhGTY=";
+    hash = "sha256-TS87rFmK6IZbyj+11Oi/lHepa3MDebYILVLLLAgNEdc=";
  };

  postPatch = ''
--- a/pkgs/by-name/ty/typstyle/Cargo.lock
+++ b/pkgs/by-name/ty/typstyle/Cargo.lock
@ -3915,7 +3915,7 @@ dependencies = [

 [[package]]
 name = "typstyle"
-version = "0.12.0"
+version = "0.12.1"
 dependencies = [
 "anyhow",
 "clap",
--- a/pkgs/by-name/ty/typstyle/package.nix
+++ b/pkgs/by-name/ty/typstyle/package.nix
@ -2,24 +2,19 @@
  lib,
  rustPlatform,
  fetchFromGitHub,
-  pkg-config,
-  libgit2,
-  zlib,
-  stdenv,
-  darwin,
  nix-update-script,
  versionCheckHook,
 }:

 rustPlatform.buildRustPackage rec {
  pname = "typstyle";
-  version = "0.12.0";
+  version = "0.12.1";

  src = fetchFromGitHub {
    owner = "Enter-tainer";
    repo = "typstyle";
    rev = "refs/tags/v${version}";
-    hash = "sha256-jrhxOtaawZ2vCiK8BQ9G09HTC5F6cnEK/Ji567xYfXw=";
+    hash = "sha256-liGGnaUhi3/d4SxpiG/P1wp89brqUJaLyo9/KJvPf9I=";
  };

  cargoLock = {
@ -29,22 +24,6 @@ rustPlatform.buildRustPackage rec {
    };
  };

-  nativeBuildInputs = [
-    pkg-config
-  ];
-
-  buildInputs =
-    [
-      libgit2
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.apple_sdk.frameworks.CoreFoundation
-      darwin.apple_sdk.frameworks.CoreServices
-      darwin.apple_sdk.frameworks.Security
-      darwin.apple_sdk.frameworks.SystemConfiguration
-    ];
-
  # Disabling tests requiring network access
  checkFlags = [
    "--skip=e2e"
--- a/pkgs/applications/misc/valent/default.nix
+++ b/pkgs/applications/misc/valent/default.nix
@ -1,37 +1,38 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, desktop-file-utils
-, meson
-, ninja
-, pkg-config
-, wrapGAppsHook4
-, vala
-, evolution-data-server-gtk4
-, gdk-pixbuf
-, glib
-, glib-networking
-, gnutls
-, gst_all_1
-, json-glib
-, libadwaita
-, libpeas2
-, libphonenumber
-, libportal-gtk4
-, pipewire
-, pulseaudio
-, tinysparql
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  desktop-file-utils,
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsHook4,
+  vala,
+  evolution-data-server-gtk4,
+  gdk-pixbuf,
+  glib,
+  glib-networking,
+  gnutls,
+  gst_all_1,
+  json-glib,
+  libadwaita,
+  libpeas2,
+  libphonenumber,
+  libportal-gtk4,
+  pipewire,
+  pulseaudio,
+  tinysparql,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "valent";
-  version = "1.0.0.alpha.46";
+  version = "1.0.0.alpha.46-unstable-2024-10-26";

  src = fetchFromGitHub {
    owner = "andyholmes";
    repo = "valent";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-DpDHU1l8Pot0RwVR1rL9fIhMHo18eo7nTecnSa3hG2E=";
+    rev = "165a2791d4bf3e7dee69e3dd7885dbe4948265b9";
+    hash = "sha256-7klvOvwyAg+Xno6zWo8UByjaS9OkOuCceuZcAIEgdyU=";
    fetchSubmodules = true;
  };

@ -63,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  mesonFlags = [
-    "-Dplugin_bluez=true"
+    (lib.mesonBool "plugin_bluez" true)
  ];

  meta = {
@ -88,7 +89,11 @@ stdenv.mkDerivation (finalAttrs: {
    '';
    homepage = "https://valent.andyholmes.ca";
    changelog = "https://github.com/andyholmes/valent/blob/${finalAttrs.src.rev}/CHANGELOG.md";
-    license = with lib.licenses; [ gpl3Plus cc0 cc-by-sa-30 ];
+    license = with lib.licenses; [
+      gpl3Plus
+      cc0
+      cc-by-sa-30
+    ];
    maintainers = with lib.maintainers; [ aleksana ];
    platforms = lib.platforms.linux;
  };
--- a/pkgs/by-name/ve/vesktop/package.nix
+++ b/pkgs/by-name/ve/vesktop/package.nix
@ -125,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
    ''
    + lib.optionalString stdenv.hostPlatform.isDarwin ''
      mkdir -p $out/{Applications,bin}
-      mv dist/mac*/Vesktop.App $out/Applications
+      mv dist/mac*/Vesktop.app $out/Applications/Vesktop.app
    ''
    + ''
      runHook postInstall
--- a/pkgs/data/fonts/twemoji-color-font/default.nix
+++ b/pkgs/data/fonts/twemoji-color-font/default.nix
@ -5,13 +5,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "twemoji-color-font";
-  version = "15.0.3";
+  version = "15.1.0";

  # We fetch the prebuilt font because building it takes 1.5 hours on hydra.
  # Relevant issue: https://github.com/NixOS/nixpkgs/issues/97871
  src = fetchurl {
    url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${finalAttrs.version}/TwitterColorEmoji-SVGinOT-Linux-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-3mpcuQ3BaEyPmCMOrfWLA4XE9UkfbAgoIwF9nKHT7Ho=";
+    sha256 = "sha256-yKUwLuTkwhiM54Xt2ExQxhagf26Z/huRrsuk4ds0EpU=";
  };

  dontBuild = true;
--- a/pkgs/development/libraries/faudio/default.nix
+++ b/pkgs/development/libraries/faudio/default.nix
@ -4,13 +4,13 @@

 stdenv.mkDerivation rec {
  pname = "faudio";
-  version = "24.10";
+  version = "24.11";

  src = fetchFromGitHub {
    owner = "FNA-XNA";
    repo = "FAudio";
    rev = version;
-    sha256 = "sha256-BUR/zFYOaEoa4pUUgzIcrWrpDX4AP9cySIelralb/t0=";
+    sha256 = "sha256-fmJh2DZNAjqqTDFt5b2HZ5oeS7VkvPy1a8gr59OQSUo=";
  };

  nativeBuildInputs = [cmake];
--- a/pkgs/development/libraries/libsnark/default.nix
+++ b/pkgs/development/libraries/libsnark/default.nix
@ -1,28 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }:
-
-stdenv.mkDerivation rec {
-  pname = "libsnark";
-  version = "unstable-2018-01-15";
-
-  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps;
-
-  cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin || !stdenv.hostPlatform.isx86) [ "-DWITH_SUPERCOP=OFF" ]
-    ++ lib.optionals (!stdenv.hostPlatform.isx86) [ "-DCURVE=ALT_BN128" ];
-
-  src = fetchFromGitHub {
-    rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07";
-    owner           = "scipr-lab";
-    repo            = "libsnark";
-    sha256          = "13f02qp2fmfhvxlp4xi69m0l8r5nq913l2f0zwdk7hl46lprfdca";
-    fetchSubmodules = true;
-  };
-
-  meta = with lib; {
-    description = "C++ library for zkSNARKs";
-    homepage = "https://github.com/scipr-lab/libsnark";
-    license = licenses.mit;
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
-  };
-}
--- a/pkgs/development/libraries/neatvnc/default.nix
+++ b/pkgs/development/libraries/neatvnc/default.nix
@ -24,6 +24,13 @@ stdenv.mkDerivation rec {
    hash = "sha256-2gPDcFcu1kGIDubguL38Z0K+k7WGFf7DX8yZteedcNg=";
  };

+  patches = [
+    # Fix build with latest ffmpeg
+    # Backport of https://github.com/any1/neatvnc/commit/7e008743bf872598b4fcdb2a821041064ce5dd01
+    # FIXME: remove in next update
+    ./fix-ffmpeg.patch
+  ];
+
  strictDeps = true;

  nativeBuildInputs = [
--- a/pkgs/development/libraries/neatvnc/fix-ffmpeg.patch
+++ b/pkgs/development/libraries/neatvnc/fix-ffmpeg.patch
@ -0,0 +1,13 @@
+diff --git a/src/h264-encoder.c b/src/h264-encoder.c
+index 6ad0262..f4a4421 100644
+--- a/src/h264-encoder.c
+++ b/src/h264-encoder.c
+@@ -547,7 +547,7 @@ struct h264_encoder* h264_encoder_create(uint32_t width, uint32_t height,
+ 		goto codec_context_failure;
+ 
+ 	self->codec_ctx->hw_frames_ctx =
+-		av_buffer_ref(self->filter_out->inputs[0]->hw_frames_ctx);
+		av_buffer_ref(av_buffersink_get_hw_frames_ctx(self->filter_out));
+ 
+ 	AVDictionary *opts = NULL;
+ 	av_dict_set_int(&opts, "async_depth", 1, 0);
--- a/pkgs/development/python-modules/autarco/default.nix
+++ b/pkgs/development/python-modules/autarco/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "autarco";
-  version = "3.0.0";
+  version = "3.1.0";
  pyproject = true;

  disabled = pythonOlder "3.11";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "klaasnicolaas";
    repo = "python-autarco";
    rev = "refs/tags/v${version}";
-    hash = "sha256-7Q6kvJxhds0myu3pMOLSCJKwoGPzHjNSo8H3ctgFvjM=";
+    hash = "sha256-zSqIEtQucrrAFEY7pBJ14Cevq8xbcGOheEmEE7Jd4qk=";
  };

  pythonRelaxDeps = [ "orjson" ];
--- a/pkgs/development/python-modules/bring-api/default.nix
+++ b/pkgs/development/python-modules/bring-api/default.nix
@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "bring-api";
-  version = "0.9.0";
+  version = "0.9.1";
  pyproject = true;

  disabled = pythonOlder "3.11";
@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "miaucl";
    repo = "bring-api";
    rev = "refs/tags/${version}";
-    hash = "sha256-eXT7H2GGNpSo58eK5f6b5eLWYgjxEV8iLgaVTpkt9EU=";
+    hash = "sha256-wPplw1yYJ5xR2CzhDXXjhMFJ7swGf2AARI4a1kE8MRw=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/cronsim/default.nix
+++ b/pkgs/development/python-modules/cronsim/default.nix
@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "cronsim";
-  version = "2.5";
+  version = "2.6";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "cuu508";
    repo = "cronsim";
    rev = "refs/tags/${version}";
-    hash = "sha256-TSVFkMCMmrMXaPJPPNjIML+z98i1iIYuKH7hHiZnJkg=";
+    hash = "sha256-WJ3v2cqAKZkXp1u8xJ0aFuyHPq0gn24DRxpnq5cH/90=";
  };

  nativeCheckInputs = [ pytestCheckHook ];
--- a/pkgs/development/python-modules/daltonlens/default.nix
+++ b/pkgs/development/python-modules/daltonlens/default.nix
@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  setuptools-git,
+  numpy,
+  pillow,
+  pytestCheckHook,
+}:
+buildPythonPackage rec {
+  pname = "daltonlens";
+  version = "0.1.5";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-T7fXlRdFtcVw5WURPqZhCmulUi1ZnCfCXgcLtTHeNas=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-git
+  ];
+
+  dependencies = [
+    numpy
+    pillow
+  ];
+
+  pythonImportsCheck = [
+    "daltonlens"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [
+    "tests/"
+  ];
+
+  disabledTestPaths = [
+    "tests/test_generate.py"
+  ];
+
+  meta = {
+    description = "R&D companion package for the desktop application DaltonLens";
+    homepage = "https://github.com/DaltonLens/DaltonLens-Python";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aleksana ];
+  };
+}
--- a/pkgs/development/python-modules/devpi-common/default.nix
+++ b/pkgs/development/python-modules/devpi-common/default.nix
@ -10,6 +10,7 @@
  setuptools-changelog-shortener,
  setuptools,
  tomli,
+  nix-update-script,
 }:

 buildPythonPackage rec {
@ -41,6 +42,8 @@ buildPythonPackage rec {

  pythonImportsCheck = [ "devpi_common" ];

+  passthru.updateScript = nix-update-script { };
+
  meta = with lib; {
    homepage = "https://github.com/devpi/devpi";
    description = "Utilities jointly used by devpi-server and devpi-client";
--- a/pkgs/development/python-modules/gspread/default.nix
+++ b/pkgs/development/python-modules/gspread/default.nix
@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "gspread";
-  version = "6.1.3";
+  version = "6.1.4";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "burnash";
    repo = "gspread";
    rev = "refs/tags/v${version}";
-    hash = "sha256-ZMzgIRLwMXvJ+JIz3BUps7CTaV/MhfjZYqkEbgHQh+A=";
+    hash = "sha256-xW0PoWMLOtg6+0oqRJxhraNrkndvlbSzyActxjnvUmw=";
  };

  nativeBuildInputs = [ flit-core ];
--- a/pkgs/development/python-modules/h5netcdf/default.nix
+++ b/pkgs/development/python-modules/h5netcdf/default.nix
@ -12,14 +12,14 @@

 buildPythonPackage rec {
  pname = "h5netcdf";
-  version = "1.3.0";
+  version = "1.4.0";
  format = "pyproject";

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

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-oXHAJ9rrNLJMJKO2MEGVuOq7tvEMdIJW7Tz+GYBjg88=";
+    hash = "sha256-6VnDtb08p5Zc5fQ4Ok4Dj/y1UDTGPXkYKb0zpaw4qWI=";
  };

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

 buildPythonPackage rec {
  pname = "photutils";
-  version = "2.0.0";
+  version = "2.0.2";
  pyproject = true;

  disabled = pythonOlder "3.10";
@ -32,7 +32,7 @@ buildPythonPackage rec {
    owner = "astropy";
    repo = "photutils";
    rev = "refs/tags/${version}";
-    hash = "sha256-slrg1iByOhW1jiSG7nKHWj0ZSOP8v3LhCCr+DLLspKM=";
+    hash = "sha256-gXtC6O8rXBBa8VMuqxshnJieAahv3bCY2C1BXNmJxb4=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/pillow-jpls/default.nix
+++ b/pkgs/development/python-modules/pillow-jpls/default.nix
@ -67,7 +67,7 @@ buildPythonPackage rec {

  pypaBuildFlags = [
    "-C"
-    "cmake.args='--preset=sysdeps'"
+    "cmake.args=--preset=sysdeps"
  ];

  nativeCheckInputs = [ pytestCheckHook ];
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@ -18,14 +18,14 @@ in

 buildPythonPackage rec {
  pname = "pyscard";
-  version = "2.1.1";
+  version = "2.2.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "LudovicRousseau";
    repo = "pyscard";
    rev = "refs/tags/${version}";
-    hash = "sha256-wlw2QL1vfhXba8ok/URcd9M+F7Sa+ZtekV1w5X24owE=";
+    hash = "sha256-yZeP4Tcxnwb2My+XOsMtj+H8mNIf6JYf5tpOVUYjev0=";
  };

  build-system = [ setuptools ];
@ -37,36 +37,31 @@ buildPythonPackage rec {
  nativeCheckInputs = [ pytestCheckHook ];

  postPatch =
-    if withApplePCSC then
-      ''
-        substituteInPlace smartcard/scard/winscarddll.c \
-          --replace-fail "/System/Library/Frameworks/PCSC.framework/PCSC" \
-                    "${PCSC}/Library/Frameworks/PCSC.framework/PCSC"
-      ''
-    else
-      ''
-        substituteInPlace setup.py --replace "pkg-config" "$PKG_CONFIG"
-        substituteInPlace smartcard/scard/winscarddll.c \
-          --replace-fail "libpcsclite.so.1" \
-                    "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}"
-      '';
+    ''
+      substituteInPlace pyproject.toml \
+        --replace-fail 'requires = ["setuptools","swig"]' 'requires = ["setuptools"]'
+    ''
+    + (
+      if withApplePCSC then
+        ''
+          substituteInPlace src/smartcard/scard/winscarddll.c \
+            --replace-fail "/System/Library/Frameworks/PCSC.framework/PCSC" \
+                      "${PCSC}/Library/Frameworks/PCSC.framework/PCSC"
+        ''
+      else
+        ''
+          substituteInPlace setup.py --replace-fail "pkg-config" "$PKG_CONFIG"
+          substituteInPlace src/smartcard/scard/winscarddll.c \
+            --replace-fail "libpcsclite.so.1" \
+                      "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}"
+        ''
+    );

-  preCheck = ''
-    # remove src module, so tests use the installed module instead
-    rm -r smartcard
-  '';
-
-  disabledTests = [
-    # AssertionError
-    "test_hresult"
-    "test_low_level"
-  ];
-
-  meta = with lib; {
+  meta = {
    description = "Smartcard library for python";
    homepage = "https://pyscard.sourceforge.io/";
    changelog = "https://github.com/LudovicRousseau/pyscard/releases/tag/${version}";
-    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ layus ];
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ layus ];
  };
 }
--- a/pkgs/development/python-modules/pytado/default.nix
+++ b/pkgs/development/python-modules/pytado/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "pytado";
-  version = "0.17.6";
+  version = "0.17.7";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "wmalgadey";
    repo = "PyTado";
    rev = "refs/tags/${version}";
-    hash = "sha256-KcYxUKQuO7TLS4YPg2mrBjP+DMnvZeJokGzwmeM/CvE=";
+    hash = "sha256-WpGznYNVpis1pM9PRXHnQVev3JW6baUT5J9iPxwd0Uk=";
  };

  nativeBuildInputs = [ setuptools ];
--- a/pkgs/development/python-modules/python-lorem/default.nix
+++ b/pkgs/development/python-modules/python-lorem/default.nix
@ -0,0 +1,37 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  pytestCheckHook,
+}:
+buildPythonPackage rec {
+  pname = "python-lorem";
+  version = "1.3.0.post3";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version;
+    pname = "python_lorem";
+    hash = "sha256-Vw1TKheXg+AkhksnmWUfdIo+Jt7X7m1pS2f0Kfe8pv0=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "lorem"
+  ];
+
+  meta = {
+    description = "Pythonic lorem ipsum generator";
+    homepage = "https://github.com/JarryShaw/lorem";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ aleksana ];
+  };
+}
--- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix
+++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix
@ -27,7 +27,7 @@

 buildPythonPackage rec {
  pname = "pytorch-metric-learning";
-  version = "2.6.0";
+  version = "2.7.0";
  pyproject = true;

  disabled = isPy27;
@ -36,7 +36,7 @@ buildPythonPackage rec {
    owner = "KevinMusgrave";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-xlTqUUF+tUIbULd1B8XR18Kxd7kl2TRKdbp0GoAfi4g=";
+    hash = "sha256-mxAl4GMyAWtvocc68Ac3z1+W13k9OOK7aQFfB7X0f9c=";
  };

  build-system = [
--- a/pkgs/development/python-modules/recurring-ical-events/default.nix
+++ b/pkgs/development/python-modules/recurring-ical-events/default.nix
@ -16,7 +16,7 @@

 buildPythonPackage rec {
  pname = "recurring-ical-events";
-  version = "3.3.2";
+  version = "3.3.3";

  disabled = pythonOlder "3.8";

@ -25,8 +25,8 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "niccokunzmann";
    repo = "python-recurring-ical-events";
-    rev = "v${version}";
-    hash = "sha256-1cWjOaL+STrHMux/fc+FaRVQIOMcseznNRcghsV+DtM=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-gEatTTpRiqtDAn+JtoJuVHPYKmEkc5saw3hy4ZYZfX8=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/scalene/default.nix
+++ b/pkgs/development/python-modules/scalene/default.nix
@ -39,7 +39,7 @@ in

 buildPythonPackage rec {
  pname = "scalene";
-  version = "1.5.45";
+  version = "1.5.46";
  pyproject = true;
  disabled = pythonOlder "3.9";

@ -47,7 +47,7 @@ buildPythonPackage rec {
    owner = "plasma-umass";
    repo = "scalene";
    rev = "v${version}";
-    hash = "sha256-0DhoLsXv2tUEkynMkoA14pNxF6GGLe30bfUOii7+PYE=";
+    hash = "sha256-G+fX0D70aGOmXr/SqaBKkOz3CEHpGqClFFdTeOzRpaw=";
  };

  patches = [
--- a/pkgs/development/python-modules/sensoterra/default.nix
+++ b/pkgs/development/python-modules/sensoterra/default.nix
@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  pythonOlder,
+  requests,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "sensoterra";
+  version = "2.0.1";
+  pyproject = true;
+
+  disabled = pythonOlder "3.11";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-WfjTOns5OPU8+ufDeFdDGjURhBWUFfw/qRSHQazBL04=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
+
+  # Test require network access
+  doCheck = false;
+
+  pythonImportsCheck = [ "sensoterra" ];
+
+  meta = {
+    description = "Query Sensoterra probes using the Customer API";
+    homepage = "https://gitlab.com/sensoterra/public/python";
+    changelog = "https://gitlab.com/sensoterra/public/python/-/blob/main/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/spotifyaio/default.nix
+++ b/pkgs/development/python-modules/spotifyaio/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "spotifyaio";
-  version = "0.8.1";
+  version = "0.8.2";
  pyproject = true;

  disabled = pythonOlder "3.11";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "joostlek";
    repo = "python-spotify";
    rev = "refs/tags/v${version}";
-    hash = "sha256-R77bdJidZrsaQZjgCr7OLDab2NpJ10575j8rgmFjn2g=";
+    hash = "sha256-GSUIotR1uB+KjuVIjsJIIaUFfg9gJ8aIYm+aR8iJT9Y=";
  };

  build-system = [ poetry-core ];
--- a/pkgs/development/python-modules/stringzilla/default.nix
+++ b/pkgs/development/python-modules/stringzilla/default.nix
@ -13,20 +13,20 @@

 buildPythonPackage rec {
  pname = "stringzilla";
-  version = "3.10.5";
+  version = "3.10.7";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "ashvardanian";
    repo = "stringzilla";
    rev = "refs/tags/v${version}";
-    hash = "sha256-E7w6s813OGCld/GRTHMbjVAReTGb37HlB687gP9N9FA=";
+    hash = "sha256-36W7/PL8nRty8cHuMoTr73tQ4uvtjkwP9lyzNLCuhv0=";
  };

  cargoDeps = rustPlatform.fetchCargoTarball {
    inherit src;
    name = "${pname}-${version}";
-    hash = "sha256-36LN9AoAWA//pldmQZtKMrck4EoGUW9G2vzdsRw08SA=";
+    hash = "sha256-qa03Jd0MMtDwkp2E81MacRMbzD/O7E29BT0tc2OjLiY=";
  };

  build-system = [
--- a/pkgs/development/python-modules/svg-path/default.nix
+++ b/pkgs/development/python-modules/svg-path/default.nix
@ -1,7 +1,8 @@
 {
  lib,
  buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+  setuptools,
  pillow,
  pytestCheckHook,
  pythonOlder,
@ -9,16 +10,20 @@

 buildPythonPackage rec {
  pname = "svg.path";
-  version = "6.2";
-  format = "setuptools";
+  version = "6.3";
+  pyproject = true;

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

-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-GiFZ+duJjfk8RjfP08yvfaH9Bz9Z+ppZUMc+RtSqGso=";
+  src = fetchFromGitHub {
+    owner = "regebro";
+    repo = "svg.path";
+    rev = "refs/tags/${version}";
+    hash = "sha256-qes6cKw/Ok0WgcPO/NPuREVNUbnlhm82jF90dK7Ay8U=";
  };

+  build-system = [ setuptools ];
+
  nativeCheckInputs = [
    pillow
    pytestCheckHook
@ -34,6 +39,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "SVG path objects and parser";
    homepage = "https://github.com/regebro/svg.path";
+    changelog = "https://github.com/regebro/svg.path/blob/${version}/CHANGES.txt";
    license = licenses.mit;
    maintainers = [ ];
  };
--- a/pkgs/development/python-modules/taxi/default.nix
+++ b/pkgs/development/python-modules/taxi/default.nix
@ -3,30 +3,29 @@
  buildPythonPackage,
  fetchFromGitHub,
  appdirs,
-  requests,
  click,
-  setuptools,
+  flit-core,
  pytestCheckHook,
  freezegun,
 }:

 buildPythonPackage rec {
  pname = "taxi";
-  version = "6.2.0";
-  format = "setuptools";
+  version = "6.3.1";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "sephii";
    repo = "taxi";
    rev = version;
-    hash = "sha256-wtLlO/W+39kTPjb2U6c54bxWxAQB7CxGxBh8gur+RCQ=";
+    hash = "sha256-QB88RpgzrQy7DGeRdMHC2SV5Esp/r5LZtlaY5C8vJxw=";
  };

-  propagatedBuildInputs = [
+  build-system = [ flit-core ];
+
+  dependencies = [
    appdirs
-    requests
    click
-    setuptools
  ];

  nativeCheckInputs = [
--- a/pkgs/development/python-modules/textstat/default.nix
+++ b/pkgs/development/python-modules/textstat/default.nix
@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pyphen,
+  pytestCheckHook,
+  pytest,
+}:
+buildPythonPackage rec {
+  version = "0.7.4";
+  pname = "textstat";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "textstat";
+    repo = "textstat";
+    rev = version;
+    hash = "sha256-UOCWsIdoVGxmkro4kNBYNMYhA3kktngRDxKjo6o+GXY=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest
+  ];
+
+  dependencies = [
+    setuptools
+    pyphen
+  ];
+
+  pythonImportsCheck = [
+    "textstat"
+  ];
+
+  pytestFlagsArray = [
+    "test.py"
+  ];
+
+  meta = {
+    description = "Python package to calculate readability statistics of a text object";
+    homepage = "https://textstat.org";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aleksana ];
+  };
+}
--- a/pkgs/development/python-modules/uuid6/default.nix
+++ b/pkgs/development/python-modules/uuid6/default.nix
@ -0,0 +1,44 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  pytestCheckHook,
+}:
+buildPythonPackage rec {
+  pname = "uuid6";
+  version = "2024.7.10";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-LSnX9j9ZPKruoODQ3QrYEpycZjsp4ZvfiC6GS+3xj7A=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [
+    "test/"
+  ];
+
+  disabledTestPaths = [
+    "test/test_uuid6.py"
+  ];
+
+  pythonImportsCheck = [
+    "uuid6"
+  ];
+
+  meta = {
+    description = "New time-based UUID formats which are suited for use as a database key";
+    homepage = "https://github.com/oittaa/uuid6-python";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aleksana ];
+  };
+}
--- a/pkgs/development/tools/bloom/default.nix
+++ b/pkgs/development/tools/bloom/default.nix
@ -1,55 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, yaml-cpp
-, qtbase
-, qtsvg
-, wrapQtAppsHook
-, qttools
-, libusb1
-, php
-, hidapi
-, procps
-}:
-
-stdenv.mkDerivation rec {
-  pname = "bloom";
-  version = "1.0.0";
-
-  src = fetchFromGitHub {
-    owner = "bloombloombloom";
-    repo = "Bloom";
-    rev = "v${version}";
-    hash = "sha256-ZZfclZwxsCgApUII79bJVyT5V/dF9jm7l8ynRWCh0UU=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    php
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    hidapi
-    libusb1
-    procps
-    qtbase
-    qtsvg
-    qttools
-    yaml-cpp
-  ];
-
-  postPatch = ''
-    sed -i 's|/usr|${placeholder "out"}|' cmake/Installing.cmake
-  '';
-
-  meta = {
-    description = "Debug interface for AVR-based embedded systems development on GNU/Linux";
-    homepage = "https://bloom.oscillate.io/";
-    license = lib.licenses.lgpl3Only;
-    maintainers = [ ];
-    mainProgram = "bloom";
-    platforms = lib.platforms.linux;
-  };
-}
--- a/pkgs/development/tools/ctlptl/default.nix
+++ b/pkgs/development/tools/ctlptl/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "ctlptl";
-  version = "0.8.34";
+  version = "0.8.35";

  src = fetchFromGitHub {
    owner = "tilt-dev";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-Fmv6hq7t0ZrlWIbK8ahCXzgNI8Mg94nTmb9rgd5KEEY=";
+    hash = "sha256-JFHPwda1p3xIfbQqnl3tI7Z/LhAB1U2VtLvT2DlyQMo=";
  };

  vendorHash = "sha256-d9TijRzBpMvRrOMexGtewtAA9XpLwDTjPnPzt7G67Cs=";
--- a/pkgs/development/tools/database/pgweb/default.nix
+++ b/pkgs/development/tools/database/pgweb/default.nix
@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "pgweb";
-  version = "0.16.1";
+  version = "0.16.2";

  src = fetchFromGitHub {
    owner = "sosedoff";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-lQc1ELeH2i9tate47rdHxFnvjQQUdg1B0CXcr5YGC+g=";
+    hash = "sha256-gZK8+H3dBMzSVyE96E7byihKMR4+1YlVFZJtCTGUZwI=";
  };

  postPatch = ''
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/pkgs/development/tools/devpi-client/default.nix
@ -5,17 +5,18 @@
  glibcLocales,
  python3,
  fetchPypi,
+  nix-update-script,
 }:

 python3.pkgs.buildPythonApplication rec {
  pname = "devpi-client";
-  version = "7.1.0";
+  version = "7.2.0";
  pyproject = true;

  src = fetchPypi {
-    pname = "devpi_client";
+    pname = "devpi-client";
    inherit version;
-    hash = "sha256-NwbhrojxOJSpDvMk0MbAGCbjmS8z2g1ynW6zzgVvy/M=";
+    hash = "sha256-wUM2hFjDh4unvuah2bQY4uZZVxo4VmFPWNdriigmnXs=";
  };

  build-system = with python3.pkgs; [
@ -66,6 +67,8 @@ python3.pkgs.buildPythonApplication rec {

  pythonImportsCheck = [ "devpi" ];

+  passthru.updateScript = nix-update-script { };
+
  meta = with lib; {
    description = "Client for devpi, a pypi index server and packaging meta tool";
    homepage = "http://doc.devpi.net";
--- a/pkgs/development/tools/devpi-server/default.nix
+++ b/pkgs/development/tools/devpi-server/default.nix
@ -1,4 +1,5 @@
 { lib, fetchFromGitHub, buildPythonApplication
+, gitUpdater
 , pythonOlder
 , aiohttp
 , appdirs
@ -29,7 +30,7 @@

 buildPythonApplication rec {
  pname = "devpi-server";
-  version = "6.10.0";
+  version = "6.14.0";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -38,7 +39,7 @@ buildPythonApplication rec {
    owner = "devpi";
    repo = "devpi";
    rev = "server-${version}";
-    hash = "sha256-JqYWWItdAgtUtiYSqxUd40tT7ON4oHiDA4/3Uhb01b8=";
+    hash = "sha256-j8iILbptUw8DUE9lFpjDp/VYzdJzmOYqM/RCnkpWdcA=";
  };

  sourceRoot = "${src.name}/server";
@ -116,6 +117,11 @@ buildPythonApplication rec {
    };
  };

+  # devpi uses a monorepo for server,common,client and web
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "server-";
+  };
+
  meta = with lib;{
    homepage = "http://doc.devpi.net";
    description = "Github-style pypi index server and packaging meta tool";
--- a/pkgs/games/frozen-bubble/default.nix
+++ b/pkgs/games/frozen-bubble/default.nix
@ -1,37 +0,0 @@
-{ lib, fetchurl, perlPackages, pkg-config, SDL, SDL_mixer, SDL_Pango, glib
-, copyDesktopItems, makeDesktopItem
-}:
-perlPackages.buildPerlModule {
-  pname = "frozen-bubble";
-  version = "2.212";
-
-  src = fetchurl {
-    url = "mirror://cpan/authors/id/K/KT/KTHAKORE/Games-FrozenBubble-2.212.tar.gz";
-    sha256 = "721e04ff69c5233060656bfbf4002aa1aeadd96c95351f0c57bb85b6da35a305";
-  };
-  patches = [ ./fix-compilation.patch ];
-
-  nativeBuildInputs = [ copyDesktopItems pkg-config ];
-
-  buildInputs =  [ glib SDL SDL_mixer SDL_Pango perlPackages.SDL perlPackages.FileSlurp ];
-  propagatedBuildInputs = with perlPackages; [ AlienSDL CompressBzip2 FileShareDir FileWhich IPCSystemSimple LocaleMaketextLexicon ];
-
-  perlPreHook = "export LD=$CC";
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "frozen-bubble";
-      exec = "frozen-bubble";
-      desktopName = "Frozen Bubble";
-      genericName = "Frozen Bubble";
-      comment = "Arcade/reflex colour matching game";
-      categories = [ "Game" ];
-    })
-  ];
-
-  meta = {
-    description = "Puzzle with Bubbles";
-    license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ puckipedia ];
-  };
-}
--- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
+++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
@ -855,7 +855,6 @@ if [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" =
        "--no-ask-password"
        "--pipe"
        "--quiet"
-        "--same-dir"
        "--service-type=exec"
        "--unit=nixos-rebuild-switch-to-configuration"
        "--wait"
--- a/pkgs/os-specific/linux/universal-pidff/default.nix
+++ b/pkgs/os-specific/linux/universal-pidff/default.nix
@ -7,13 +7,13 @@

 stdenv.mkDerivation rec {
  pname = "universal-pidff";
-  version = "0.0.8";
+  version = "0.0.10";

  src = fetchFromGitHub {
    owner = "JacKeTUs";
    repo = "universal-pidff";
    rev = "refs/tags/${version}";
-    hash = "sha256-DptLqyjfRCpkbyFAQI8sylyKu2XyZZGrSITva9vcXGQ=";
+    hash = "sha256-BViobWl+9ypTcQJWtZ9pbeU4cmHcFNZWlsmQUOO64Vc=";
  };

  postPatch = ''
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@ -3828,7 +3828,8 @@
      zeroconf
    ];
    "sensoterra" = ps: with ps; [
-    ]; # missing inputs: sensoterra
+      sensoterra
+    ];
    "sentry" = ps: with ps; [
      sentry-sdk
    ];
@ -5660,6 +5661,7 @@
    "sensor"
    "sensorpro"
    "sensorpush"
+    "sensoterra"
    "sentry"
    "senz"
    "seventeentrack"
--- a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
  owner = "wills106";
  domain = "solax_modbus";
-  version = "2024.10.4";
+  version = "2024.11.1";

  src = fetchFromGitHub {
    owner = "wills106";
    repo = "homeassistant-solax-modbus";
    rev = "refs/tags/${version}";
-    hash = "sha256-EeFDUxZ7/W5Ng+d56mOCeRntga0uU55OQsaPWzM/bcY=";
+    hash = "sha256-AzzTJ1W1lwLkewanVC2HxC89Zg1OyLRJ2xPtHWXVr6c=";
  };

  dependencies = [ pymodbus ];
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@ -33,13 +33,13 @@ assert withHyperscan -> stdenv.hostPlatform.isx86_64;

 stdenv.mkDerivation rec {
  pname = "rspamd";
-  version = "3.10.0";
+  version = "3.10.2";

  src = fetchFromGitHub {
    owner = "rspamd";
    repo = "rspamd";
    rev = version;
-    hash = "sha256-fsxeTgciZb0HqvRWoUjwe/mrRZPW23hOwx7PJBSlBSo=";
+    hash = "sha256-x0Mw2ug5H6BZI6LKOjFufYzGVxZIkgxXHeIX7Emsj8A=";
  };

  hardeningEnable = [ "pie" ];
--- a/pkgs/tools/admin/sec/default.nix
+++ b/pkgs/tools/admin/sec/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "sec";
-  version = "2.9.2";
+  version = "2.9.3";

  src = fetchFromGitHub {
    owner = "simple-evcorr";
    repo = "sec";
    rev = version;
-    sha256 = "sha256-s5xalQfZIrvj8EcLvN0swpYBgRhE1YUoPmQYVFB0lWA=";
+    sha256 = "sha256-iK2v/qCWw4jdSEpx6cwSB98n5iFmbCyJH0lIpUG8pAU=";
  };

  buildInputs = [ perl ];
--- a/pkgs/tools/archivers/7zz/default.nix
+++ b/pkgs/tools/archivers/7zz/default.nix
@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
      "CXX=${stdenv.cc.targetPrefix}c++"
    ]
    ++ lib.optionals useUasm [ "MY_ASM=uasm" ]
+    ++ lib.optionals (!useUasm && stdenv.hostPlatform.isx86) [ "USE_ASM=" ]
    # We need at minimum 10.13 here because of utimensat, however since
    # we need a bump anyway, let's set the same minimum version as the one in
    # aarch64-darwin so we don't need additional changes for it
--- a/pkgs/tools/graphics/goverlay/default.nix
+++ b/pkgs/tools/graphics/goverlay/default.nix
@ -26,7 +26,7 @@

 let
  # Finds data files using the XDG Base Directory Specification
-  # See https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+  # See https://specifications.freedesktop.org/basedir-spec/latest
  find-xdg-data-files = writeScriptBin "find-xdg-data-files" ''
    #!${bash}/bin/sh
    IFS=:
--- a/pkgs/tools/misc/os-prober/default.nix
+++ b/pkgs/tools/misc/os-prober/default.nix
@ -11,14 +11,14 @@ lvm2        # lvs
 }:

 stdenv.mkDerivation rec {
-  version = "1.81";
+  version = "1.83";
  pname = "os-prober";
  src = fetchFromGitLab {
    domain = "salsa.debian.org";
    owner = "installer-team";
    repo = pname;
    rev = version;
-    sha256 = "sha256-3FXfGadIcmKp4qn6ZDcOSQHYsUNP2ObL1cJesNle+8A=";
+    sha256 = "sha256-cTufM82YE1L7d3kIOtncICInBPEw4o4NzQXB4uDrMKI=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/tools/networking/telepresence2/default.nix
+++ b/pkgs/tools/networking/telepresence2/default.nix
@ -27,13 +27,13 @@ let
 in
 buildGoModule rec {
  pname = "telepresence2";
-  version = "2.20.1";
+  version = "2.20.2";

  src = fetchFromGitHub {
    owner = "telepresenceio";
    repo = "telepresence";
    rev = "v${version}";
-    hash = "sha256-ubMlCN7dGCKxBCFNzfnpaDzKCYUNwWwj/84gq/tbw9o=";
+    hash = "sha256-MwAet+UJ6BNEj6/NYN9HBxTGbw2CS2ASUJQrKtpoV1I=";
  };

  propagatedBuildInputs = [
@ -47,7 +47,7 @@ buildGoModule rec {
    export CGO_ENABLED=0
  '';

-  vendorHash = "sha256-pz0a0w4SBPJVLWlZi6tsWysiJmwSzroF61nsFxg3R4g=";
+  vendorHash = "sha256-i9quHeAb8PCG1KQGKaOkxTxjImiuK6oMJcRI443/mkI=";

  ldflags = [
    "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}"
--- a/Show More
+++ b/Show More