Merge master into haskell-updates

2024-11-04 00:17:26 +00:00 · 2024-11-04 00:17:26 +00:00 · 57af37a3be
commit 57af37a3be
parent 92ce112366 b90f2b68c3
272 changed files with 5390 additions and 7750 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;
@ -15580,6 +15585,12 @@
    githubId = 3159451;
    name = "Nicolas Schneider";
  };
+  nipeharefa = {
+    name = "Nipe Harefa";
+    email = "nipeharefa@gmail.com";
+    github = "nipeharefa";
+    githubId = 12620257;
+  };
  NIS = {
    name = "NSC IT Solutions";
    github = "dev-nis";
--- a/nixos/lib/systemd-lib.nix
+++ b/nixos/lib/systemd-lib.nix
@ -99,8 +99,9 @@ in rec {
      l = reverseList (stringToCharacters s);
      suffix = head l;
      nums = tail l;
-    in elem suffix (["K" "M" "G" "T"] ++ digits)
-      && all (num: elem num digits) nums;
+    in builtins.isInt s
+      || (elem suffix (["K" "M" "G" "T"] ++ digits)
+          && all (num: elem num digits) nums);

  assertByteFormat = name: group: attr:
    optional (attr ? ${name} && ! isByteFormat attr.${name})
--- 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/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@ -217,7 +217,7 @@ in
  imports = let
    mkToolModule = { name, package ? pkgs.${name} }: { config, ... }: {
      options.system.tools.${name}.enable = lib.mkEnableOption "${name} script" // {
-        default = config.nix.enable;
+        default = config.nix.enable && ! config.system.disableInstallerTools;
        internal = true;
      };

@ -235,27 +235,14 @@ in
    (mkToolModule { name = "nixos-version"; package = nixos-version; })
  ];

-  config = lib.mkMerge [
-    (lib.mkIf config.system.disableInstallerTools {
-      system.tools = {
-        nixos-build-vms.enable = false;
-        nixos-enter.enable = false;
-        nixos-generate-config.enable = false;
-        nixos-install.enable = false;
-        nixos-option.enable = false;
-        nixos-rebuild.enable = false;
-        nixos-version.enable = false;
-      };
-    })
-    {
-      documentation.man.man-db.skipPackages = [ nixos-version ];
+  config = {
+    documentation.man.man-db.skipPackages = [ nixos-version ];

-      # These may be used in auxiliary scripts (ie not part of toplevel), so they are defined unconditionally.
-      system.build = {
-        inherit nixos-generate-config nixos-install nixos-rebuild;
-        nixos-option = lib.warn "Accessing nixos-option through `config.system.build` is deprecated, use `pkgs.nixos-option` instead." pkgs.nixos-option;
-        nixos-enter = lib.warn "Accessing nixos-enter through `config.system.build` is deprecated, use `pkgs.nixos-enter` instead." pkgs.nixos-enter;
-      };
-    }
-  ];
+    # These may be used in auxiliary scripts (ie not part of toplevel), so they are defined unconditionally.
+    system.build = {
+      inherit nixos-generate-config nixos-install nixos-rebuild;
+      nixos-option = lib.warn "Accessing nixos-option through `config.system.build` is deprecated, use `pkgs.nixos-option` instead." pkgs.nixos-option;
+      nixos-enter = lib.warn "Accessing nixos-enter through `config.system.build` is deprecated, use `pkgs.nixos-enter` instead." pkgs.nixos-enter;
+    };
+  };
 }
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@ -32,6 +32,12 @@ let
     ${cfg.extraCgroupConfig}
   '';

+  mpiConf =  pkgs.writeTextDir "mpi.conf"
+   ''
+     PMIxCliTmpDirBase=${cfg.mpi.PmixCliTmpDirBase}
+     ${cfg.mpi.extraMpiConfig}
+   '';
+
  slurmdbdConf = pkgs.writeText "slurmdbd.conf"
   ''
     DbdHost=${cfg.dbdserver.dbdHost}
@ -45,7 +51,7 @@ let
  # in the same directory as slurm.conf
  etcSlurm = pkgs.symlinkJoin {
    name = "etc-slurm";
-    paths = [ configFile cgroupConfig plugStackConfig ] ++ cfg.extraConfigPaths;
+    paths = [ configFile cgroupConfig plugStackConfig mpiConf ] ++ cfg.extraConfigPaths;
  };
 in

@ -242,6 +248,24 @@ in
        '';
      };

+      mpi = {
+        PmixCliTmpDirBase = lib.mkOption {
+          default = "/tmp/pmix";
+          type = lib.types.str;
+          description = ''
+            Base path for PMIx temporary files.
+          '';
+        };
+
+        extraMpiConfig = lib.mkOption {
+          default = "";
+          type = lib.types.lines;
+          description = ''
+            Extra configuration for that will be added to `mpi.conf`.
+          '';
+        };
+      };
+
      extraPlugstackConfig = lib.mkOption {
        default = "";
        type = lib.types.lines;
@ -372,8 +396,9 @@ in
      };
    };

-    systemd.tmpfiles.rules = lib.mkIf cfg.client.enable [
+    systemd.tmpfiles.rules = lib.optionals cfg.client.enable [
      "d /var/spool/slurmd 755 root root -"
+      "d ${cfg.mpi.PmixCliTmpDirBase} 755 root root -"
    ];

    services.openssh.settings.X11Forwarding = lib.mkIf cfg.client.enable (lib.mkDefault true);
--- 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/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "mongodb-vscode";
    publisher = "mongodb";
-    version = "1.9.1";
-    hash = "sha256-XWWBk/QW37Dg0RJJwJ65w1r9WGC6iAGCgigsnGm/ilc=";
+    version = "1.9.3";
+    hash = "sha256-3+KIO2d/0egvc4awStYgPvpWa9fmYH0V7QHUavzFn8A=";
  };

  meta = {
--- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
@ -6,28 +6,28 @@
 }:

 let
-  version = "0.12.2";
+  version = "0.12.3";

  sources = {
    "x86_64-linux" = {
      arch = "linux-x64";
      url = "https://download.visualjj.com/visualjj-linux-x64-${version}.vsix";
-      hash = "sha256-42xUp1HDnu1YZwXYgBhqshNzA0sx7VZLZzSaQypZb1M=";
+      hash = "sha256-dpvdWE0LL4PY2bzfRLazqP+VB9SSyhwnMLoOLsMmNJw=";
    };
    "x86_64-darwin" = {
      arch = "darwin-x64";
      url = "https://download.visualjj.com/visualjj-darwin-x64-${version}.vsix";
-      hash = "sha256-RFxhGKQpQnMbwuYfHQolFRJxI61hzog2A44x7W39yKw=";
+      hash = "sha256-81ahZTuIG5ukXm+gmVzg4RgryRTyOIBaQ6BvGLCXVp0=";
    };
    "aarch64-linux" = {
      arch = "linux-arm64";
      url = "https://download.visualjj.com/visualjj-linux-arm64-${version}.vsix";
-      hash = "sha256-KHeg2wAe1aynwAbQh5Do/rCbk2bqLZ3iIrYpDFRIw/E=";
+      hash = "sha256-brheyxw4tHXF5Guzn8fzolQmcLQvOknPeAtGNPowcBk=";
    };
    "aarch64-darwin" = {
      arch = "darwin-arm64";
      url = "https://download.visualjj.com/visualjj-darwin-arm64-${version}.vsix";
-      hash = "sha256-3y/MhxDgQBnbQ2OYLYFcl7488sKE7iVO4YhUhmQyCIM=";
+      hash = "sha256-EgupFXNfKKkk3FgEmgYwsY/QdaTLlbghKIIHQcvLatY=";
    };
  };
 in
--- a/pkgs/applications/file-managers/mucommander/deps.json
+++ b/pkgs/applications/file-managers/mucommander/deps.json
--- 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/upscayl/default.nix
+++ b/pkgs/applications/graphics/upscayl/default.nix
@ -1,41 +0,0 @@
-{
-  appimageTools,
-  fetchurl,
-  lib,
-}: let
-  pname = "upscayl";
-  version = "2.11.5";
-
-  src = fetchurl {
-    url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage";
-    hash = "sha256-owxSm8t7rHM5ywJPp8sJQ5aAyNKgrbyJY6qFp78/UhM=";
-  };
-
-  appimageContents = appimageTools.extractType2 {
-    inherit pname version src;
-  };
-in
-  appimageTools.wrapType2 {
-    inherit pname version src;
-
-    extraPkgs = pkgs: [ pkgs.vulkan-headers pkgs.vulkan-loader ];
-
-    extraInstallCommands = ''
-      mkdir -p $out/share/{applications,pixmaps}
-
-      cp ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
-      cp ${appimageContents}/${pname}.png $out/share/pixmaps/${pname}.png
-
-      substituteInPlace $out/share/applications/${pname}.desktop \
-        --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}'
-    '';
-
-    meta = with lib; {
-      description = "Free and Open Source AI Image Upscaler";
-      homepage = "https://upscayl.github.io/";
-      maintainers = with maintainers; [icy-thought];
-      license = licenses.agpl3Plus;
-      platforms = platforms.linux;
-      mainProgram = "upscayl";
-    };
-  }
--- 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/misc/notesnook/default.nix
+++ b/pkgs/applications/misc/notesnook/default.nix
@ -2,7 +2,7 @@

 let
  pname = "notesnook";
-  version = "3.0.16";
+  version = "3.0.19";

  inherit (stdenv.hostPlatform) system;
  throwSystem = throw "Unsupported system: ${system}";
@ -16,9 +16,9 @@ let
  src = fetchurl {
    url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}";
    hash = {
-      x86_64-linux = "sha256-HywWk3MAWdRVaQyimlQJCFsgydXdE0VSLWliZT7f8w0=";
-      x86_64-darwin = "sha256-GgZVVt1Gm95/kyI/q99fZ9BIN+5kpxumcSJ9BexfARc=";
-      aarch64-darwin = "sha256-ldg+bVROm/XzACCmiMapMQf3f6le9FHzt18QcaH8TxA=";
+      x86_64-linux = "sha256-yCzREyFyGoAPXVVnNX6GUrr83oaPtoNOgZOOd6vJD1Q=";
+      x86_64-darwin = "sha256-WciEpt0vUuXS6YeZkbyFGqQaotXoZkWnkkn5B6/JXwE=";
+      aarch64-darwin = "sha256-iP3Xd/otYEVwU85U2dlFcX9QjDq2CbIqHmcDYVxzqzI=";
    }.${system} or throwSystem;
  };

--- a/pkgs/applications/misc/toot/default.nix
+++ b/pkgs/applications/misc/toot/default.nix
@ -1,36 +0,0 @@
-{ lib, fetchFromGitHub, python3Packages, nixosTests }:
-
-python3Packages.buildPythonApplication rec {
-  pname = "toot";
-  version = "0.42.0";
-
-  src = fetchFromGitHub {
-    owner  = "ihabunek";
-    repo   = "toot";
-    rev = "refs/tags/${version}";
-    sha256 = "sha256-FxA/loJzb/DBI1vWC71IFqdFcwjwIezhBJCGNeBzRoU=";
-  };
-
-  nativeCheckInputs = with python3Packages; [ pytest ];
-
-  propagatedBuildInputs = with python3Packages;
-  [
-    requests beautifulsoup4 future wcwidth
-    urwid urwidgets psycopg2 tomlkit click
-  ];
-
-  checkPhase = ''
-    py.test
-  '';
-
-  passthru.tests.toot = nixosTests.pleroma;
-
-  meta = with lib; {
-    description = "Mastodon CLI interface";
-    mainProgram = "toot";
-    homepage    = "https://github.com/ihabunek/toot";
-    license     = licenses.gpl3;
-    maintainers = [ maintainers.matthiasbeyer ];
-  };
-
-}
--- a/pkgs/applications/networking/ids/suricata/default.nix
+++ b/pkgs/applications/networking/ids/suricata/default.nix
@ -33,11 +33,11 @@
 in
 stdenv.mkDerivation rec {
  pname = "suricata";
-  version = "7.0.6";
+  version = "7.0.7";

  src = fetchurl {
    url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz";
-    hash = "sha256-IYJPf/Egh8DJud4gcZmnWpwxsDA2aIx8ucF48KO1f40=";
+    hash = "sha256-JtCjYZTVMID8iwm5mbK1qDxASfQK0H72rmnHIlpyi4Y=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
@ -7,6 +7,9 @@
 , yasm
 }:

+let
+  version = "1.4.9";
+in
 (libsForQt5.callPackage ../telegram-desktop/default.nix {
  inherit stdenv;

@ -24,13 +27,23 @@
      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 ];
  });

  withWebKitGTK = false;
 }).overrideAttrs {
  pname = "kotatogram-desktop";
-  version = "1.4.9-unstable-2024-09-27";
+  version = "${version}-unstable-2024-09-27";

  src = fetchFromGitHub {
    owner = "kotatogram";
@ -41,8 +54,6 @@
  };

  patches = [
-    ./macos.patch
-    ./macos-opengl.patch
    ./macos-qt5.patch
    (fetchpatch {
      url = "https://gitlab.com/mnauw/cppgir/-/commit/c8bb1c6017a6f7f2e47bd10543aea6b3ec69a966.patch";
@ -59,10 +70,10 @@

      It contains some useful (or purely cosmetic) features, but they could be unstable. A detailed list is available here: https://kotatogram.github.io/changes
    '';
-    license = licenses.gpl3;
+    license = licenses.gpl3Only;
    platforms = platforms.all;
    homepage = "https://kotatogram.github.io";
-    changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}";
+    changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k${version}";
    maintainers = with maintainers; [ ilya-fedin ];
    mainProgram = if stdenv.hostPlatform.isLinux then "kotatogram-desktop" else "Kotatogram";
  };
--- 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/kotatogram-desktop/with-webkit.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix
@ -1,9 +1,9 @@
-{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk_4_1, makeWrapper }:
+{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk_4_1, makeBinaryWrapper }:

 stdenv.mkDerivation {
  pname = "${kotatogram-desktop.pname}-with-webkit";
  version = kotatogram-desktop.version;
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeBinaryWrapper ];
  dontUnpack = true;
  installPhase = ''
    mkdir -p $out
@ -12,7 +12,8 @@ stdenv.mkDerivation {
  '';
  postFixup = ''
    mkdir -p $out/bin
-    makeWrapper ${kotatogram-desktop}/bin/kotatogram-desktop $out/bin/kotatogram-desktop \
+    makeBinaryWrapper {${kotatogram-desktop},$out}/bin/${kotatogram-desktop.meta.mainProgram} \
+      --inherit-argv0 \
      --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules \
      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk_4_1 ]}
  '';
--- 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/networking/irc/srain/default.nix
+++ b/pkgs/applications/networking/irc/srain/default.nix
@ -21,13 +21,13 @@

 stdenv.mkDerivation rec {
  pname = "srain";
-  version = "1.7.0";
+  version = "1.8.0";

  src = fetchFromGitHub {
    owner = "SrainApp";
    repo = "srain";
    rev = version;
-    hash = "sha256-mhnlHnF23+VZvSPNuTYYUVcA6Md4y2AGqEuJphY1/IY=";
+    hash = "sha256-c5dy5dD5Eb/MVNCpLqIGNuafsrmgLjEfRfSxKVxu5wY=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@ -3,26 +3,26 @@
 , buildGoModule
 , stdenv
 , lib
-, procps
 , fetchFromGitHub
 , nixosTests
 , autoSignDarwinBinariesHook
+, nix-update-script
 }:

 let
  common = { stname, target, postInstall ? "" }:
    buildGoModule rec {
      pname = stname;
-      version = "1.27.12";
+      version = "1.28.0";

      src = fetchFromGitHub {
        owner = "syncthing";
        repo = "syncthing";
-        rev = "v${version}";
-        hash = "sha256-/HPq71KkWUE0vG7qUBD3JON4N5KBkuRWc4SvX/JA2nQ=";
+        rev = "refs/tags/v${version}";
+        hash = "sha256-JW78n/3hssH600uXn4YLxcIJylPbSpEZICtKmqfqamI=";
      };

-      vendorHash = "sha256-R5GlsCkfoMc5km+NaV+TNUlM3Ot1ARcXfEFimcZOLI4=";
+      vendorHash = "sha256-9/PfiOSCInduQXZ47KbrD3ca9O0Zt+TP7XoX+HjwQgs=";

      nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
        # Recent versions of macOS seem to require binaries to be signed when
@ -43,7 +43,7 @@ let
        (
          export GOOS="${pkgsBuildBuild.go.GOOS}" GOARCH="${pkgsBuildBuild.go.GOARCH}" CC=$CC_FOR_BUILD
          go build build.go
-          go generate github.com/syncthing/syncthing/lib/api/auto github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto
+          go generate github.com/syncthing/syncthing/lib/api/auto github.com/syncthing/syncthing/cmd/infra/strelaypoolsrv/auto
        )
        ./build -goos ${go.GOOS} -goarch ${go.GOARCH} -no-upgrade -version v${version} build ${target}
        runHook postBuild
@ -57,8 +57,11 @@ let

      inherit postInstall;

-      passthru.tests = {
-        inherit (nixosTests) syncthing syncthing-init syncthing-relay;
+      passthru = {
+        tests = {
+          inherit (nixosTests) syncthing syncthing-init syncthing-relay;
+        };
+        updateScript = nix-update-script { };
      };

      meta = {
--- a/pkgs/applications/science/biology/gatk/default.nix
+++ b/pkgs/applications/science/biology/gatk/default.nix
@ -2,10 +2,10 @@

 stdenv.mkDerivation rec {
  pname = "gatk";
-  version = "4.6.0.0";
+  version = "4.6.1.0";
  src = fetchzip {
    url = "https://github.com/broadinstitute/gatk/releases/download/${version}/gatk-${version}.zip";
-    sha256 = "sha256-AwGRkgVbG2gA4K1JG0WPr4v18JHG5YzYUKdJ2EJZX+Y=";
+    sha256 = "sha256-jVrFhLgHPIcWFCP3FU+LxR+UE+lVRzE6WZuLfwdL708=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@ -12,6 +12,7 @@
 , tk
 , wrapGAppsHook3
 , xz
+, desktopToDarwinBundle
 }:

 stdenv.mkDerivation rec {
@ -23,7 +24,11 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-VKpFeI1tUq+2WcOu8zWq/eDvLImQp3cPjqpk5X8ic0Y=";
  };

-  nativeBuildInputs = [ pkg-config wrapGAppsHook3 ];
+  nativeBuildInputs = [
+    pkg-config wrapGAppsHook3
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    desktopToDarwinBundle
+  ];
  buildInputs = [ bzip2 glib gperf gtk3 judy tcl tk xz ]
    ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration;

@ -42,6 +47,14 @@ stdenv.mkDerivation rec {
    "--enable-gtk3"
  ];

+  postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mv $out/bin/.gtkwave-wrapped $out/Applications/GTKWave.app/Contents/MacOS/.gtkwave-wrapped
+    makeWrapper $out/Applications/GTKWave.app/Contents/MacOS/.gtkwave-wrapped $out/Applications/GTKWave.app/Contents/MacOS/GTKWave \
+      --inherit-argv0 \
+      "''${gappsWrapperArgs[@]}"
+    ln -sf $out/Applications/GTKWave.app/Contents/MacOS/GTKWave $out/bin/gtkwave
+  '';
+
  meta = {
    description = "VCD/Waveform viewer for Unix and Win32";
    homepage = "https://gtkwave.sourceforge.net";
--- 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/git-sync/default.nix
+++ b/pkgs/applications/version-management/git-sync/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "git-sync";
-  version = "unstable-2022-03-20";
+  version = "0-unstable-2024-02-15";

  src = fetchFromGitHub {
    owner = "simonthum";
    repo = "git-sync";
-    rev = "8466b77a38b3d5e8b4ed9e3cb1b635e475eeb415";
-    sha256 = "sha256-8rCwpmHV6wgFCLzPJOKzwN5mG8uD5KIlGFwcgQD+SK4=";
+    rev = "493b0155fb974b477b6ea623d6e41e13ddad8500";
+    hash = "sha256-hsq+kpB+akjbFKBeHMsP8ibrtygEG2Yf2QW9vFFIano=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- 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/video/kodi/addons/youtube/default.nix
+++ b/pkgs/applications/video/kodi/addons/youtube/default.nix
@ -3,13 +3,13 @@
 buildKodiAddon rec {
  pname = "youtube";
  namespace = "plugin.video.youtube";
-  version = "7.1.0";
+  version = "7.1.0.1";

  src = fetchFromGitHub {
    owner = "anxdpanic";
    repo = "plugin.video.youtube";
    rev = "v${version}";
-    hash = "sha256-I3dSGcPQVVhn4RO8CHtn3FG2dheSv4XiDO7w+MtTjRU=";
+    hash = "sha256-5tctuY2vYEfkkNVjprnUPJ/crwmMGCEdcRxUQR5EQxw=";
  };

  propagatedBuildInputs = [
--- 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/applications/radio/abracadabra/default.nix
+++ b/pkgs/applications/radio/abracadabra/default.nix
@ -3,12 +3,7 @@
  stdenv,
  fetchFromGitHub,
  cmake,
-  wrapQtAppsHook,
-  qtbase,
-  qtmultimedia,
-  qttools,
-  qtpositioning,
-  qtlocation,
+  qt6,
  faad2,
  mpg123,
  portaudio,
@ -20,26 +15,26 @@

 stdenv.mkDerivation rec {
  pname = "abracadabra";
-  version = "2.6.0";
+  version = "2.7.0";

  src = fetchFromGitHub {
    owner = "KejPi";
    repo = "AbracaDABra";
    rev = "v${version}";
-    hash = "sha256-oO8ef2VTw/gVNNU2JRXtEHEkJm7X7dypjZr0vZXCfH8=";
+    hash = "sha256-iHa41VmCrNGsj+6LeYIigwiBahQuTVr+bAo0kFmQ6dw=";
  };

  nativeBuildInputs = [
    cmake
-    wrapQtAppsHook
-    qttools
+    qt6.wrapQtAppsHook
+    qt6.qttools
  ];

  buildInputs = [
-    qtbase
-    qtmultimedia
-    qtlocation
-    qtpositioning
+    qt6.qtbase
+    qt6.qtmultimedia
+    qt6.qtlocation
+    qt6.qtpositioning
    faad2
    mpg123
    portaudio
--- a/pkgs/by-name/ae/aerogramme/package.nix
+++ b/pkgs/by-name/ae/aerogramme/package.nix
@ -50,5 +50,6 @@ rustPlatform.buildRustPackage rec {
    maintainers = with lib.maintainers; [ supinie ];
    mainProgram = "aerogramme";
    platforms = lib.platforms.linux;
+    broken = true; # https://github.com/rust-lang/rust/issues/129811
  };
 }
--- a/pkgs/by-name/ai/aider-chat/package.nix
+++ b/pkgs/by-name/ai/aider-chat/package.nix
@ -12,7 +12,7 @@ let
    self = python3;
    packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; };
  };
-  version = "0.60.0";
+  version = "0.61.0";
 in
 python3.pkgs.buildPythonApplication {
  pname = "aider-chat";
@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication {
    owner = "Aider-AI";
    repo = "aider";
    rev = "refs/tags/v${version}";
-    hash = "sha256-0jAdUcGGJzxvTKY/56an0oLEghZHz6fdNLg8cPer1Qc=";
+    hash = "sha256-C1VMdLRb+FVN8zwWRa7RCkRxZgdUPNUfBdAjMi9efjQ=";
  };

  pythonRelaxDeps = true;
@ -113,6 +113,13 @@ python3.pkgs.buildPythonApplication {
    wcwidth
    yarl
    zipp
+
+    # Not listed in requirements
+    mixpanel
+    monotonic
+    posthog
+    propcache
+    python-dateutil
  ];

  buildInputs = [ portaudio ];
@ -151,6 +158,15 @@ python3.pkgs.buildPythonApplication {
    export AIDER_CHECK_UPDATE=false
  '';

+  optional-dependencies = with python3.pkgs; {
+    playwright = [
+      greenlet
+      playwright
+      pyee
+      typing-extensions
+    ];
+  };
+
  meta = {
    description = "AI pair programming in your terminal";
    homepage = "https://github.com/paul-gauthier/aider";
--- a/pkgs/by-name/ba/baidupcs-go/package.nix
+++ b/pkgs/by-name/ba/baidupcs-go/package.nix
@ -0,0 +1,33 @@
+{
+  buildGo122Module,
+  lib,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+buildGo122Module rec {
+  pname = "baidupcs-go";
+  version = "3.9.5";
+  src = fetchFromGitHub {
+    owner = "qjfoidnh";
+    repo = "BaiduPCS-Go";
+    rev = "v${version}";
+    hash = "sha256-zNodRQzflOOB3hAeq4KbjRFlHQwknVy+4ucipUcoufY=";
+  };
+
+  vendorHash = "sha256-msTlXtidxLTe3xjxTOWCqx/epFT0XPdwGPantDJUGpc=";
+  doCheck = false;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
+
+  meta = {
+    maintainers = with lib.maintainers; [ xddxdd ];
+    description = "Baidu Netdisk commandline client, mimicking Linux shell file handling commands";
+    homepage = "https://github.com/qjfoidnh/BaiduPCS-Go";
+    license = lib.licenses.asl20;
+    mainProgram = "BaiduPCS-Go";
+  };
+}
--- a/pkgs/by-name/ca/catppuccin-cursors/package.nix
+++ b/pkgs/by-name/ca/catppuccin-cursors/package.nix
@ -40,7 +40,7 @@ let
  };
  variantName = { palette, color }: palette + color;
  variants = lib.mapCartesianProduct variantName dimensions;
-  version = "1.0.0";
+  version = "1.0.1";
 in
 stdenvNoCC.mkDerivation {
  pname = "catppuccin-cursors";
@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation {
    owner = "catppuccin";
    repo = "cursors";
    rev = "v${version}";
-    hash = "sha256-LZ2k8i4w68VW4YFmC659iMQsQyduHJOfyL8cLlXhUHo=";
+    hash = "sha256-l01L0UiE9bgUOMHhs74Bndarw2b6TaJGW/xU/8rfoAk=";
  };

  nativeBuildInputs = [
--- 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/deepsource/package.nix
+++ b/pkgs/by-name/de/deepsource/package.nix
@ -0,0 +1,62 @@
+{
+  lib,
+  stdenv,
+  installShellFiles,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+
+buildGoModule rec {
+  pname = "deepsource";
+  version = "0.8.6";
+
+  src = fetchFromGitHub {
+    owner = "DeepSourceCorp";
+    repo = "cli";
+    rev = "v${version}";
+    hash = "sha256-6uNb4cQVerrlW/eUkjmlO1i1YKYX3qaVdo0i5cczt+I=";
+  };
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  doCheck = true;
+
+  checkFlags =
+    let
+      # Skip tests that require network access
+      skippedTests = [
+        "TestReportKeyValueWorkflow"
+        "TestReportAnalyzerTypeWorkflow"
+        "TestReportKeyValueFileWorkflow"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
+  vendorHash = "sha256-SsMq4ngq3sSOL28ysHTxTF4CT9sIcCIW7yIhBxIPrNs=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=main.version=${version}"
+  ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd deepsource \
+      --bash <($out/bin/deepsource completion bash) \
+      --fish <($out/bin/deepsource completion fish) \
+      --zsh <($out/bin/deepsource completion zsh)
+  '';
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  meta = {
+    description = "Command line interface to DeepSource, the code health platform";
+    mainProgram = "deepsource";
+    homepage = "https://github.com/DeepSourceCorp/cli";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ nipeharefa ];
+  };
+}
--- a/pkgs/by-name/de/dep-scan/package.nix
+++ b/pkgs/by-name/de/dep-scan/package.nix
@ -7,10 +7,10 @@
 let
  appthreat-vulnerability-db = (
    python3.pkgs.appthreat-vulnerability-db.overrideAttrs (oldAttrs: rec {
-      version = "5.7.3";
+      version = "5.7.8";
      src = oldAttrs.src.override {
        rev = "refs/tags/v${version}";
-        hash = "sha256-MrlgBUx3T2G46Pnah3obe5b4yKDzsAFVC/B7AHM0kZY=";
+        hash = "sha256-R00/a9+1NctVPi+EL7K65w/e88c9oSW5xXGgno+MCXo=";
      };
    })
  );
@ -18,16 +18,18 @@ let
 in
 python3.pkgs.buildPythonApplication rec {
  pname = "dep-scan";
-  version = "5.4.3";
+  version = "5.4.8";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "owasp-dep-scan";
    repo = "dep-scan";
    rev = "refs/tags/v${version}";
-    hash = "sha256-m0vDsCetOSfScu1eprrGaDJ1VuXxuNFBitK8N5GtfSQ=";
+    hash = "sha256-QTvxKoqBxTb/xFaIHsYe3N+7ABJ6sDd2vVcjkMbm3xI=";
  };

+  pythonRelaxDeps = [ "oras" ];
+
  build-system = with python3.pkgs; [ setuptools ];

  dependencies = with python3.pkgs; [
--- 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/diffnav/package.nix
+++ b/pkgs/by-name/di/diffnav/package.nix
@ -0,0 +1,41 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  makeBinaryWrapper,
+  delta,
+}:
+
+buildGoModule rec {
+  pname = "diffnav";
+  version = "0.2.8";
+
+  src = fetchFromGitHub {
+    owner = "dlvhdr";
+    repo = "diffnav";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-xZAi/Ky1RjOxjhQKHvozaPTqDPcrGfhMemGWzi7WyW4=";
+  };
+
+  vendorHash = "sha256-2JjQF+fwl8+Xoq9T3jCvngRAOa3935zpi9qbF4w4hEI=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+  postInstall = ''
+    wrapProgram $out/bin/diffnav \
+      --prefix PATH : ${lib.makeBinPath [ delta ]}
+  '';
+
+  meta = {
+    changelog = "https://github.com/dlvhdr/diffnav/releases/tag/${src.rev}";
+    description = "Git diff pager based on delta but with a file tree, à la GitHub";
+    homepage = "https://github.com/dlvhdr/diffnav";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ amesgen ];
+    mainProgram = "diffnav";
+  };
+}
--- 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/em/ember-cli/package.json
+++ b/pkgs/by-name/em/ember-cli/package.json
@ -1,182 +0,0 @@
-{
-  "name": "ember-cli",
-  "version": "5.3.0",
-  "description": "Command line tool for developing ambitious ember.js apps",
-  "keywords": [
-    "app",
-    "app-kit",
-    "blockchain",
-    "cli",
-    "ember",
-    "ember-app-kit",
-    "ember.js",
-    "kit"
-  ],
-  "homepage": "https://cli.emberjs.com/release/",
-  "bugs": {
-    "url": "https://github.com/ember-cli/ember-cli/issues"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ember-cli/ember-cli.git"
-  },
-  "license": "MIT",
-  "author": "Stefan Penner, Robert Jackson and ember-cli contributors",
-  "main": "lib/cli/index.js",
-  "bin": {
-    "ember": "./bin/ember"
-  },
-  "scripts": {
-    "docs": "yuidoc",
-    "lint": "eslint . --cache",
-    "prepack": "yarn docs",
-    "test": "node --unhandled-rejections=strict tests/runner",
-    "test:all": "node --unhandled-rejections=strict tests/runner all",
-    "test:cover": "nyc --all --reporter=text --reporter=lcov node tests/runner all",
-    "test:debug": "node --unhandled-rejections=strict debug tests/runner",
-    "test:slow": "node --unhandled-rejections=strict tests/runner slow"
-  },
-  "dependencies": {
-    "@babel/core": "^7.22.10",
-    "@pnpm/find-workspace-dir": "^6.0.2",
-    "broccoli": "^3.5.2",
-    "broccoli-builder": "^0.18.14",
-    "broccoli-concat": "^4.2.5",
-    "broccoli-config-loader": "^1.0.1",
-    "broccoli-config-replace": "^1.1.2",
-    "broccoli-debug": "^0.6.5",
-    "broccoli-funnel": "^3.0.8",
-    "broccoli-funnel-reducer": "^1.0.0",
-    "broccoli-merge-trees": "^4.2.0",
-    "broccoli-middleware": "^2.1.1",
-    "broccoli-slow-trees": "^3.1.0",
-    "broccoli-source": "^3.0.1",
-    "broccoli-stew": "^3.0.0",
-    "calculate-cache-key-for-tree": "^2.0.0",
-    "capture-exit": "^2.0.0",
-    "chalk": "^4.1.2",
-    "ci-info": "^3.8.0",
-    "clean-base-url": "^1.0.0",
-    "compression": "^1.7.4",
-    "configstore": "^5.0.1",
-    "console-ui": "^3.1.2",
-    "core-object": "^3.1.5",
-    "dag-map": "^2.0.2",
-    "diff": "^5.1.0",
-    "ember-cli-is-package-missing": "^1.0.0",
-    "ember-cli-lodash-subset": "^2.0.1",
-    "ember-cli-normalize-entity-name": "^1.0.0",
-    "ember-cli-preprocess-registry": "^5.0.1",
-    "ember-cli-string-utils": "^1.1.0",
-    "ensure-posix-path": "^1.1.1",
-    "execa": "^5.1.1",
-    "exit": "^0.1.2",
-    "express": "^4.18.1",
-    "filesize": "^10.0.8",
-    "find-up": "^5.0.0",
-    "find-yarn-workspace-root": "^2.0.0",
-    "fixturify-project": "^2.1.1",
-    "fs-extra": "^11.1.1",
-    "fs-tree-diff": "^2.0.1",
-    "get-caller-file": "^2.0.5",
-    "git-repo-info": "^2.1.1",
-    "glob": "^8.1.0",
-    "heimdalljs": "^0.2.6",
-    "heimdalljs-fs-monitor": "^1.1.1",
-    "heimdalljs-graph": "^1.0.0",
-    "heimdalljs-logger": "^0.1.10",
-    "http-proxy": "^1.18.1",
-    "inflection": "^2.0.1",
-    "inquirer": "^9.1.5",
-    "is-git-url": "^1.0.0",
-    "is-language-code": "^3.1.0",
-    "isbinaryfile": "^5.0.0",
-    "leek": "0.0.24",
-    "lodash.template": "^4.5.0",
-    "markdown-it": "^13.0.1",
-    "markdown-it-terminal": "^0.4.0",
-    "minimatch": "^7.4.3",
-    "morgan": "^1.10.0",
-    "nopt": "^3.0.6",
-    "npm-package-arg": "^10.1.0",
-    "os-locale": "^5.0.0",
-    "p-defer": "^3.0.0",
-    "portfinder": "^1.0.32",
-    "promise-map-series": "^0.3.0",
-    "promise.hash.helper": "^1.0.8",
-    "quick-temp": "^0.1.8",
-    "remove-types": "^1.0.0",
-    "resolve": "^1.22.1",
-    "resolve-package-path": "^4.0.3",
-    "safe-stable-stringify": "^2.4.3",
-    "sane": "^5.0.1",
-    "semver": "^7.3.5",
-    "silent-error": "^1.1.1",
-    "sort-package-json": "^1.57.0",
-    "symlink-or-copy": "^1.3.1",
-    "temp": "0.9.4",
-    "testem": "^3.10.1",
-    "tiny-lr": "^2.0.0",
-    "tree-sync": "^2.1.0",
-    "uuid": "^9.0.0",
-    "walk-sync": "^3.0.0",
-    "watch-detector": "^1.0.2",
-    "workerpool": "^6.4.0",
-    "yam": "^1.0.0"
-  },
-  "devDependencies": {
-    "@octokit/rest": "^19.0.7",
-    "broccoli-plugin": "^4.0.3",
-    "broccoli-test-helper": "^2.0.0",
-    "chai": "^4.3.7",
-    "chai-as-promised": "^7.1.1",
-    "chai-files": "^1.4.0",
-    "chai-jest-snapshot": "^2.0.0",
-    "ember-cli-blueprint-test-helpers": "^0.19.2",
-    "ember-cli-internal-test-helpers": "^0.9.1",
-    "eslint": "^8.44.0",
-    "eslint-config-prettier": "^8.9.0",
-    "eslint-plugin-chai-expect": "^3.0.0",
-    "eslint-plugin-mocha": "^10.1.0",
-    "eslint-plugin-n": "^16.0.1",
-    "eslint-plugin-prettier": "^4.2.1",
-    "fixturify": "^3.0.0",
-    "jsdom": "^21.1.1",
-    "latest-version": "^5.1.0",
-    "mocha": "^10.0.0",
-    "nock": "^13.3.0",
-    "nyc": "^15.1.0",
-    "prettier": "2.8.7",
-    "release-it": "^15.10.0",
-    "rimraf": "^3.0.2",
-    "strip-ansi": "^6.0.0",
-    "supertest": "^6.3.1",
-    "testdouble": "^3.18.0",
-    "tmp": "^0.2.1",
-    "websocket": "^1.0.32",
-    "which": "3.0.1",
-    "yuidoc-ember-cli-theme": "^1.0.4",
-    "yuidocjs": "0.10.2"
-  },
-  "engines": {
-    "node": ">= 16"
-  },
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org"
-  },
-  "release-it": {
-    "git": {
-      "tagName": "v${version}"
-    },
-    "github": {
-      "draft": true,
-      "release": true,
-      "tokenRef": "GITHUB_AUTH"
-    }
-  },
-  "trackingCode": "UA-49225444-1",
-  "volta": {
-    "node": "16.19.1",
-    "yarn": "1.22.19"
-  }
-}
--- a/pkgs/by-name/em/ember-cli/package.nix
+++ b/pkgs/by-name/em/ember-cli/package.nix
@ -1,28 +1,36 @@
-{ lib
-, mkYarnPackage
-, fetchFromGitHub
-, fetchYarnDeps
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnInstallHook,
+  nodejs,
 }:

-let
+stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "ember-cli";
  version = "5.3.0";
+
  src = fetchFromGitHub {
    owner = "ember-cli";
    repo = "ember-cli";
-    rev = "v${version}";
+    rev = "refs/tags/v${finalAttrs.version}";
    hash = "sha256-xkMsPE+iweIV14m4kE4ytEp4uHMJW6gr+n9oJblr4VQ=";
  };
-in
-mkYarnPackage {
-  inherit pname version src;

  offlineCache = fetchYarnDeps {
-    yarnLock = src + "/yarn.lock";
+    yarnLock = finalAttrs.src + "/yarn.lock";
    hash = "sha256-QgT2JFvMupJo+pJc13n2lmHMZkROJRJWoozCho3E6+c=";
  };

-  packageJSON = ./package.json;
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnInstallHook
+    nodejs
+  ];

  meta = with lib; {
    homepage = "https://github.com/ember-cli/ember-cli";
@ -32,4 +40,4 @@ mkYarnPackage {
    platforms = platforms.all;
    mainProgram = "ember";
  };
-}
+})
--- 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/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@ -2,9 +2,9 @@
  lib,
  stdenv,
  fetchFromGitHub,
+  apple-sdk_15,
  chafa,
  cmake,
-  darwin,
  dbus,
  dconf,
  ddcutil,
@ -23,15 +23,14 @@
  nix-update-script,
  ocl-icd,
  opencl-headers,
-  overrideSDK,
  pcre,
  pcre2,
  pkg-config,
  python3,
  rpm,
  sqlite,
-  testers,
  util-linux,
+  versionCheckHook,
  vulkan-loader,
  wayland,
  xfce,
@ -43,10 +42,7 @@
  waylandSupport ? true,
  x11Support ? true,
 }:
-let
-  stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
-in
-stdenv'.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
  pname = "fastfetch";
  version = "2.28.0";

@ -105,24 +101,10 @@ stdenv'.mkDerivation (finalAttrs: {
      xorg.libXext
    ]
    ++ lib.optionals (x11Support && (!stdenv.hostPlatform.isDarwin)) [ xfce.xfconf ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (
-      with darwin.apple_sdk_11_0.frameworks;
-      [
-        Apple80211
-        AppKit
-        AVFoundation
-        Cocoa
-        CoreDisplay
-        CoreVideo
-        CoreWLAN
-        DisplayServices
-        IOBluetooth
-        MediaRemote
-        OpenCL
-        SystemConfiguration
-        moltenvk
-      ]
-    );
+    ++ lib.optionals stdenv.hostPlatform.isDarwin ([
+      apple-sdk_15
+      moltenvk
+    ]);

  cmakeFlags =
    [
@ -158,14 +140,11 @@ stdenv'.mkDerivation (finalAttrs: {
      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}"
  '';

-  passthru = {
-    updateScript = nix-update-script { };
-    tests.version = testers.testVersion {
-      package = finalAttrs.finalPackage;
-      command = "fastfetch -v | cut -d '(' -f 1";
-      version = "fastfetch ${finalAttrs.version}";
-    };
-  };
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };

  meta = {
    description = "An actively maintained, feature-rich and performance oriented, neofetch like system information tool";
--- 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/fn/fna3d/package.nix
+++ b/pkgs/by-name/fn/fna3d/package.nix
@ -0,0 +1,39 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  SDL2,
+}:
+stdenv.mkDerivation rec {
+  pname = "fna3d";
+  version = "24.11";
+
+  src = fetchFromGitHub {
+    owner = "FNA-XNA";
+    repo = "FNA3D";
+    rev = version;
+    fetchSubmodules = true;
+    hash = "sha256-NTVaPY39acSRibGQjLuh5ZBGC1Zep/rybVcOU0WrNIw=";
+  };
+
+  buildInputs = [ SDL2 ];
+  nativeBuildInputs = [ cmake ];
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 libFNA3D.so $out/lib/libFNA3D.so
+    ln -s libFNA3D.so $out/lib/libFNA3D.so.0
+    ln -s libFNA3D.so $out/lib/libFNA3D.so.0.${version}
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Accuracy-focused XNA4 reimplementation for open platforms";
+    homepage = "https://fna-xna.github.io/";
+    license = lib.licenses.mspl;
+    platforms = lib.platforms.linux;
+    mainProgram = pname;
+    maintainers = with lib.maintainers; [ mrtnvgr ];
+  };
+}
--- a/pkgs/by-name/fp/fprintd-tod/package.nix
+++ b/pkgs/by-name/fp/fprintd-tod/package.nix
@ -1,11 +1,18 @@
-{ lib
-, fetchFromGitLab
-, fetchpatch
-, fprintd
-, libfprint-tod
+{
+  lib,
+  fetchFromGitLab,
+  fetchpatch,
+  libxml2,
+  fprintd,
+  libfprint-tod,
+  python3Packages,
+  libpam-wrapper,
+  gusb,
+  gobject-introspection,
 }:

-(fprintd.override { libfprint = libfprint-tod; }).overrideAttrs (oldAttrs: rec {
+(fprintd.override { libfprint = libfprint-tod; }).overrideAttrs (
+  finalAttrs: previousAttrs: {
    pname = "fprintd-tod";
    version = "1.90.9";

@ -13,11 +20,24 @@
      domain = "gitlab.freedesktop.org";
      owner = "libfprint";
      repo = "fprintd";
-      rev = "v${version}";
+      rev = "v${finalAttrs.version}";
      sha256 = "sha256-rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg=";
    };

-    patches = oldAttrs.patches or [] ++ [
+    nativeBuildInputs = previousAttrs.nativeBuildInputs or [ ] ++ [
+      libpam-wrapper
+      python3Packages.python
+      python3Packages.pycairo
+      python3Packages.dbus-python
+      python3Packages.python-dbusmock
+      python3Packages.pygobject3
+      gusb
+      python3Packages.pypamtest
+      gobject-introspection
+      libxml2 # for xmllint
+    ];
+
+    patches = previousAttrs.patches or [ ] ++ [
      (fetchpatch {
        name = "use-more-idiomatic-correct-embedded-shell-scripting";
        url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch";
@ -40,11 +60,13 @@
      })
    ];

-    postPatch = oldAttrs.postPatch or "" + ''
-      # part of "remove-pointless-copying-of-files-into-build-directory" but git-apply doesn't handle renaming
-      mv src/device.xml src/net.reactivated.Fprint.Device.xml
-      mv src/manager.xml src/net.reactivated.Fprint.Manager.xml
-    '';
+    postPatch =
+      previousAttrs.postPatch or ""
+      + ''
+        # part of "remove-pointless-copying-of-files-into-build-directory" but git-apply doesn't handle renaming
+        mv src/device.xml src/net.reactivated.Fprint.Device.xml
+        mv src/manager.xml src/net.reactivated.Fprint.Manager.xml
+      '';

    meta = {
      homepage = "https://fprint.freedesktop.org/";
@ -53,4 +75,5 @@
      platforms = lib.platforms.linux;
      maintainers = with lib.maintainers; [ hmenke ];
    };
-  })
+  }
+)
--- a/pkgs/tools/security/fprintd/default.nix
+++ b/pkgs/tools/security/fprintd/default.nix
@ -1,37 +1,42 @@
-{ lib, stdenv
-, fetchFromGitLab
-, pkg-config
-, gobject-introspection
-, meson
-, ninja
-, perl
-, gettext
-, gtk-doc
-, libxslt
-, docbook-xsl-nons
-, docbook_xml_dtd_412
-, glib
-, gusb
-, dbus
-, polkit
-, nss
-, pam
-, systemd
-, libfprint
-, python3
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  pkg-config,
+  gobject-introspection,
+  meson,
+  ninja,
+  perl,
+  gettext,
+  gtk-doc,
+  libxslt,
+  docbook-xsl-nons,
+  docbook_xml_dtd_412,
+  glib,
+  gusb,
+  dbus,
+  polkit,
+  nss,
+  pam,
+  systemd,
+  libfprint,
+  python3,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "fprintd";
  version = "1.94.4";
-  outputs = [ "out" "devdoc" ];
+  outputs = [
+    "out"
+    "devdoc"
+  ];

  src = fetchFromGitLab {
    domain = "gitlab.freedesktop.org";
    owner = "libfprint";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-B2g2d29jSER30OUqCkdk3+Hv5T3DA4SUKoyiqHb8FeU=";
+    repo = "fprintd";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-B2g2d29jSER30OUqCkdk3+Hv5T3DA4SUKoyiqHb8FeU=";
  };

  nativeBuildInputs = [
@ -41,6 +46,7 @@ stdenv.mkDerivation rec {
    perl # for pod2man
    gettext
    gtk-doc
+    python3
    libxslt
    dbus
    docbook-xsl-nons
@ -81,11 +87,10 @@ stdenv.mkDerivation rec {
  # FIXME: Ugly hack for tests to find libpam_wrapper.so
  LIBRARY_PATH = lib.makeLibraryPath [ python3.pkgs.pypamtest ];

-  doCheck = true;
-
  mesonCheckFlags = [
    # PAM related checks are timing out
-    "--no-suite" "fprintd:TestPamFprintd"
+    "--no-suite"
+    "fprintd:TestPamFprintd"
  ];

  patches = [
@ -107,11 +112,11 @@ stdenv.mkDerivation rec {
      --replace "'G_DEBUG=fatal-criticals'," ""
  '';

-  meta = with lib; {
+  meta = {
    homepage = "https://fprint.freedesktop.org/";
    description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ abbradar ];
  };
-}
+})
--- a/pkgs/tools/security/fprintd/skip-test-test_removal_during_enroll.patch
+++ b/pkgs/tools/security/fprintd/skip-test-test_removal_during_enroll.patch
--- 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/ga/garble/0001-Add-version-info.patch
+++ b/pkgs/by-name/ga/garble/0001-Add-version-info.patch
@ -0,0 +1,38 @@
+From e46a41faac008ede4acbeb18db5b3076eb206de5 Mon Sep 17 00:00:00 2001
+From: wxt <3264117476@qq.com>
+Date: Sun, 3 Nov 2024 15:11:49 +0800
+Subject: [PATCH] Add version info
+
+---
+ main.go                    | 1 +
+ testdata/script/help.txtar | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/main.go b/main.go
+index 0de5a2f..1c830b1 100644
+--- a/main.go
+++ b/main.go
+@@ -362,6 +362,7 @@ func mainErr(args []string) error {
+ 		// manually construct something like a pseudo-version.
+ 		// TODO: remove when this code is dead, hopefully in Go 1.22.
+ 		if mod.Version == "(devel)" {
+			mod.Version = "@version@"
+ 			var vcsTime time.Time
+ 			var vcsRevision string
+ 			for _, setting := range info.Settings {
+diff --git a/testdata/script/help.txtar b/testdata/script/help.txtar
+index 8f25260..859f492 100644
+--- a/testdata/script/help.txtar
+++ b/testdata/script/help.txtar
+@@ -91,7 +91,7 @@ stderr 'directory not found'
+ # and to be able to use static VCS info, use an environment variable.
+ # First, test without the information, and then with it.
+ exec garble version
+-stdout -count=1 'mvdan.cc/garble \(devel\)'
+stdout -count=1 'mvdan.cc/garble @version@'
+ stdout -count=1 'Build settings'
+ stdout -count=3 '-compiler|GOOS|GOARCH'
+ ! stdout 'vcs'
+-- 
+2.46.1
+
--- a/pkgs/by-name/ga/garble/package.nix
+++ b/pkgs/by-name/ga/garble/package.nix
@ -0,0 +1,77 @@
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchFromGitHub,
+  diffoscope,
+  git,
+  versionCheckHook,
+  replaceVars,
+  nix-update-script,
+}:
+
+buildGoModule rec {
+  pname = "garble";
+  version = "0.13.0";
+
+  src = fetchFromGitHub {
+    owner = "burrowers";
+    repo = "garble";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-FtI5lAeqjRPN47iC46bcEsRLQb7mItw4svsnLkRpNxY=";
+  };
+
+  __darwinAllowLocalNetworking = true;
+
+  ldflags = [
+    "-buildid=00000000000000000000" # length=20
+  ];
+
+  patches = [
+    (replaceVars ./0001-Add-version-info.patch {
+      inherit version;
+    })
+  ];
+
+  checkFlags = [
+    "-skip"
+    "TestScript/gogarble"
+  ];
+
+  vendorHash = "sha256-mSdajYiMEg2ik0ocfmHK+XddEss1qLu6rDwzjocaaW0=";
+
+  # Used for some of the tests.
+  nativeCheckInputs = [
+    diffoscope
+    git
+    versionCheckHook
+  ];
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
+    export WORK=$(mktemp -d)
+  '';
+
+  # Several tests fail with
+  # FAIL: testdata/script/goenv.txtar:27: "$WORK/.temp 'quotes' and spaces" matches "garble|importcfg|cache\\.gob|\\.go"
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "version" ];
+  doInstallCheck = false;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Obfuscate Go code by wrapping the Go toolchain";
+    homepage = "https://github.com/burrowers/garble/";
+    maintainers = with lib.maintainers; [
+      davhau
+      bot-wxt1221
+    ];
+    license = lib.licenses.bsd3;
+    mainProgram = "garble";
+  };
+}
--- a/pkgs/by-name/ge/gepetto-viewer-corba/package.nix
+++ b/pkgs/by-name/ge/gepetto-viewer-corba/package.nix
@ -14,14 +14,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gepetto-viewer-corba";
-  version = "5.8.0";
-  pyproject = false; # CMake
+  version = "5.8.1";

  src = fetchFromGitHub {
    owner = "gepetto";
    repo = "gepetto-viewer-corba";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-/bpAs4ca/+QjWEGuHhuDT8Ts2Ggg+DZWETZfjho6E0w=";
+    hash = "sha256-C7xrODoKCcyLPZr0+zZSZ/o5i5EeNsxCPXp2WrP28A4=";
  };

  outputs = [
@ -29,12 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
    "doc"
  ];

-  postPatch = ''
-    substituteInPlace src/CMakeLists.txt \
-      --replace-fail "ARGUMENTS $" "ARGUMENTS -p${python3Packages.omniorbpy}/${python3Packages.python.sitePackages} $" \
-      --replace-fail '$'{CMAKE_SOURCE_DIR}/cmake '$'{JRL_CMAKE_MODULES}
-  '';
-
  buildInputs = [ libsForQt5.qtbase ];

  nativeBuildInputs = [
--- a/pkgs/by-name/ge/gepetto-viewer/package.nix
+++ b/pkgs/by-name/ge/gepetto-viewer/package.nix
@ -4,7 +4,6 @@
  darwin,
  doxygen,
  fetchFromGitHub,
-  fetchpatch,
  fontconfig,
  lib,
  jrl-cmakemodules,
@ -21,28 +20,15 @@
 let
  gepetto-viewer = stdenv.mkDerivation (finalAttrs: {
    pname = "gepetto-viewer";
-    version = "5.1.0";
+    version = "5.2.0";

    src = fetchFromGitHub {
      owner = "gepetto";
      repo = "gepetto-viewer";
      rev = "v${finalAttrs.version}";
-      hash = "sha256-A2J3HidG+OHJO8LpLiOEvORxDtViTdeVD85AmKkkOg8=";
+      hash = "sha256-kAQPi7bO48H0CZKz1bxfkvMiNy8RsXvRvpDK0KF7XLM=";
    };

-    patches = [
-      # fix use of CMAKE_INSTALL_BINDIR for $bin output
-      (fetchpatch {
-        url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/9b1b3a61da016934c3e766e6b491c1d6f3fc80d6.patch";
-        hash = "sha256-dpviEkOyCZpTYntZ4sCG1AvobljJphPQxg7gA6JxfWs=";
-      })
-      # fix use of CMAKE_INSTALL_FULL_INCLUDEDIR for $dev output
-      (fetchpatch {
-        url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/4e1c2bbe063db20b605e51495e9f9eca40138cca.patch";
-        hash = "sha256-HrecvW1ulCSt9+DUaQVBOoDkilGRqU2+GUx7NUw7hqc=";
-      })
-    ];
-
    cmakeFlags = [
      (lib.cmakeBool "BUILD_PY_QCUSTOM_PLOT" (!stdenv.hostPlatform.isDarwin))
      (lib.cmakeBool "BUILD_PY_QGV" (!stdenv.hostPlatform.isDarwin))
--- 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/gn/gnome-maps/package.nix
+++ b/pkgs/by-name/gn/gnome-maps/package.nix
@ -5,7 +5,6 @@
  meson,
  ninja,
  gettext,
-  python3,
  pkg-config,
  gnome,
  glib,
@ -75,8 +74,8 @@ stdenv.mkDerivation (finalAttrs: {
    # entry point to the wrapped binary we get back to a wrapped
    # binary.
    substituteInPlace "data/org.gnome.Maps.service.in" \
-        --replace "Exec=@pkgdatadir@/@app-id@" \
-                  "Exec=$out/bin/gnome-maps"
+      --replace-fail "Exec=@pkgdatadir@/@app-id@" \
+                     "Exec=$out/bin/gnome-maps"
  '';

  preCheck = ''
@ -97,6 +96,12 @@ stdenv.mkDerivation (finalAttrs: {
    rm $out/lib/gnome-maps/libgnome-maps.so.0
  '';

+  preFixup = ''
+    substituteInPlace "$out/share/applications/org.gnome.Maps.desktop" \
+      --replace-fail "Exec=gapplication launch org.gnome.Maps" \
+                     "Exec=gnome-maps"
+  '';
+
  passthru = {
    updateScript = gnome.updateScript { packageName = "gnome-maps"; };
  };
--- 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/hyprgui/package.nix
+++ b/pkgs/by-name/hy/hyprgui/package.nix
@ -0,0 +1,52 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  pkg-config,
+  glib,
+  pango,
+  cairo,
+  gtk4,
+  wrapGAppsHook4,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "hyprgui";
+  version = "0.1.7";
+
+  src = fetchFromGitHub {
+    owner = "hyprutils";
+    repo = "hyprgui";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-toHE+N18PGSp0HdR9tcVPYRdfNv20HQfS7U5fHeJ32s=";
+  };
+
+  cargoHash = "sha256-Vn059HCHwz0j6ujDVk+GNrHQ7PhqBFb3XfjKLSYlYKg=";
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    wrapGAppsHook4
+  ];
+  buildInputs = [
+    glib
+    cairo
+    pango
+    gtk4
+  ];
+
+  postInstall = ''
+    install -Dm644 -t $out/usr/share/icons hyprgui.png
+    install -Dm644 -t $out/usr/share/applications hyprgui.desktop
+  '';
+
+  meta = {
+    description = "GUI for configuring Hyprland written in Rust";
+    homepage = "https://github.com/hyprutils/hyprgui";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ fccapria ];
+    badPlatforms = lib.platforms.darwin;
+    mainProgram = "hyprgui";
+  };
+}
--- a/pkgs/by-name/hy/hypridle/package.nix
+++ b/pkgs/by-name/hy/hypridle/package.nix
@ -10,18 +10,19 @@
  wayland-scanner,
  hyprlang,
  sdbus-cpp_2,
-  systemd,
+  systemdLibs,
+  nix-update-script,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "hypridle";
-  version = "0.1.4";
+  version = "0.1.5";

  src = fetchFromGitHub {
    owner = "hyprwm";
    repo = "hypridle";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-20a3pg94dyLFflbBIN+EYJ04nWfWldTfd2YmB/rcrqY=";
+    hash = "sha256-esE2L7+9CsmlSjTIHwU9VAhzvsFSMC3kO7EiutCPQpg=";
  };

  nativeBuildInputs = [
@ -34,17 +35,22 @@ stdenv.mkDerivation (finalAttrs: {
    hyprlang
    hyprutils
    sdbus-cpp_2
-    systemd
+    systemdLibs
    wayland
    wayland-protocols
  ];

+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
  meta = {
    description = "Hyprland's idle daemon";
    homepage = "https://github.com/hyprwm/hypridle";
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [
      iogamaster
+      johnrtitor
      khaneliman
    ];
    mainProgram = "hypridle";
--- 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/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@ -17,7 +17,7 @@
  cacert,
  unzip,
  # runtime deps
-  jellyfin-ffmpeg,
+  jellyfin-ffmpeg, # Immich depends on the jellyfin customizations, see https://github.com/NixOS/nixpkgs/issues/351943
  imagemagick,
  libraw,
  libheif,
--- a/pkgs/by-name/ke/keycastr/package.nix
+++ b/pkgs/by-name/ke/keycastr/package.nix
@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "keycastr";
-  version = "0.9.18";
+  version = "0.10.1";

  src = fetchurl {
    url = "https://github.com/keycastr/keycastr/releases/download/v${finalAttrs.version}/KeyCastr.app.zip";
-    hash = "sha256-q12c/W0yGoVL+wx+T/gaevx2P0Xwcv0a0FMv7bKfUnE=";
+    hash = "sha256-Ea/QtYiM7J2Gc5T8M+WizSBrgmhJ+NW4ern2A58glUk=";
  };

  sourceRoot = ".";
--- 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,9 +88,10 @@ 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 ];
+    maintainers = with lib.maintainers; [ ];
    inherit (wayland.meta) platforms;
  };
 })
--- a/pkgs/by-name/le/less/package.nix
+++ b/pkgs/by-name/le/less/package.nix
@ -1,6 +1,8 @@
 {
  lib,
  fetchurl,
+  fetchpatch,
+  autoreconfHook,
  ncurses,
  pcre2,
  stdenv,
@ -22,6 +24,23 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-KBn1VWTYbVQqu+yv2C/2HoGaPuyWf6o2zT5o8VlqRLg=";
  };

+  patches = [
+    (fetchpatch {
+      # Fix configure parameters --with-secure=no and --without-secure.
+      url = "https://github.com/gwsw/less/commit/8fff6c56bfc833528b31ebdaee871f65fbe342b1.patch";
+      hash = "sha256-XV5XufivNWWLGeIpaP04YQPWcxIUKYYEINdT+eEx+WA=";
+      includes = [
+        "configure.ac"
+      ];
+    })
+  ];
+
+  # Need `autoreconfHook` since we patch `configure.ac`.
+  # TODO: Remove the `configure.ac` patch and `autoreconfHook` next release
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
  buildInputs = [
    ncurses
    pcre2
--- a/pkgs/development/libraries/libfprint/default.nix
+++ b/pkgs/development/libraries/libfprint/default.nix
@ -1,32 +1,37 @@
-{ lib, stdenv
-, fetchFromGitLab
-, pkg-config
-, meson
-, python3
-, ninja
-, gusb
-, pixman
-, glib
-, nss
-, gobject-introspection
-, cairo
-, libgudev
-, gtk-doc
-, docbook-xsl-nons
-, docbook_xml_dtd_43
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  pkg-config,
+  meson,
+  python3,
+  ninja,
+  gusb,
+  pixman,
+  glib,
+  nss,
+  gobject-introspection,
+  cairo,
+  libgudev,
+  gtk-doc,
+  docbook-xsl-nons,
+  docbook_xml_dtd_43,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "libfprint";
-  version = "1.94.6";
-  outputs = [ "out" "devdoc" ];
+  version = "1.94.8";
+  outputs = [
+    "out"
+    "devdoc"
+  ];

  src = fetchFromGitLab {
    domain = "gitlab.freedesktop.org";
    owner = "libfprint";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-lDnAXWukBZSo8X6UEVR2nOMeVUi/ahnJgx2cP+vykZ8=";
+    repo = "libfprint";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-PZr4ZeVnuCKYfI8CKvRqBwalxsz9Ka17kSuLflwl7mE=";
  };

  postPatch = ''
@ -82,11 +87,11 @@ stdenv.mkDerivation rec {
    runHook postInstallCheck
  '';

-  meta = with lib; {
+  meta = {
    homepage = "https://fprint.freedesktop.org/";
    description = "Library designed to make it easy to add support for consumer fingerprint readers";
-    license = licenses.lgpl21Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    license = lib.licenses.lgpl21Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ abbradar ];
  };
-}
+})
--- 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/lm/lms/package.nix
+++ b/pkgs/by-name/lm/lms/package.nix
@ -22,13 +22,13 @@

 stdenv.mkDerivation rec {
  pname = "lms";
-  version = "3.58.0";
+  version = "3.60.0";

  src = fetchFromGitHub {
    owner = "epoupon";
    repo = "lms";
    rev = "v${version}";
-    hash = "sha256-sWlD/n9Qjwiu/UfZrxRxwv2rc4XwRZN35fyjIriGZPY=";
+    hash = "sha256-sLs73356BaFbKtyQc4cTFm7Wp/UemH8J+tkajXAA0do=";
  };

  strictDeps = true;
@ -54,10 +54,7 @@ stdenv.mkDerivation rec {
  ];

  postPatch = ''
-    substituteInPlace src/lms/main.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf"
-    substituteInPlace src/tools/recommendation/LmsRecommendation.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf"
-    substituteInPlace src/tools/db-generator/LmsDbGenerator.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf"
-    substituteInPlace src/tools/cover/LmsCover.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf"
+    substituteInPlace src/libs/core/include/core/SystemPaths.hpp --replace-fail "/etc" "$out/share/lms"
  '';

  postInstall = ''
--- a/pkgs/by-name/ma/makima/package.nix
+++ b/pkgs/by-name/ma/makima/package.nix
@ -7,16 +7,16 @@

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

  src = fetchFromGitHub {
    owner = "cyber-sushi";
    repo = "makima";
    rev = "v${version}";
-    hash = "sha256-esZCFMeIRoafR7vQbnyf3Mo18trVZdIy9rvAvTHfrLA=";
+    hash = "sha256-cmn86ocN8DwxS9WpcHxWMjuFPAMmM60Q6jmyeBmdrPg=";
  };

-  cargoHash = "sha256-NXiK+cimQaYpzY3WSHUlYUWcXOLWQ5TwGuZKh+OB+go=";
+  cargoHash = "sha256-/eM+clDZRlvfFa1eEwLo8CKEvnOq5CW19RNvbEbxVE8=";

  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ udev ];
--- 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/mo/morewaita-icon-theme/package.nix
+++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix
@ -7,13 +7,13 @@
 }:
 stdenvNoCC.mkDerivation rec {
  pname = "morewaita-icon-theme";
-  version = "45";
+  version = "47.1";

  src = fetchFromGitHub {
    owner = "somepaulo";
    repo = "MoreWaita";
-    rev = "v${version}";
-    hash = "sha256-UtwigqJjkin53Wg3PU14Rde6V42eKhmP26a3fDpbJ4Y=";
+    rev = "${version}";
+    hash = "sha256-/ANzNQi+H2UzRlLrMBBMxEA/TGNpCwf8lNn6sHEKfQE=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/mu/mucommander/deps.json
+++ b/pkgs/by-name/mu/mucommander/deps.json
--- a/pkgs/applications/file-managers/mucommander/default.nix
+++ b/pkgs/applications/file-managers/mucommander/default.nix
@ -1,24 +1,22 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, gradle_7
-, makeWrapper
-, jdk
-, gsettings-desktop-schemas
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gradle,
+  makeWrapper,
+  jdk,
+  gsettings-desktop-schemas,
 }:

-let
-  gradle = gradle_7;
-in
 stdenv.mkDerivation (finalAttrs: {
  pname = "mucommander";
-  version = "1.3.0-1";
+  version = "1.5.2-1";

  src = fetchFromGitHub {
    owner = "mucommander";
    repo = "mucommander";
    rev = finalAttrs.version;
-    sha256 = "sha256-rSHHv96L2EHQuKBSAdpfi1XGP2u9o2y4g1+65FHWFMw=";
+    sha256 = "sha256-J1paBXlAGe2eKMg4wvaXTzMIiSMFIJ1XIAaKrfOwQLc=";
  };

  postPatch = ''
@ -28,7 +26,10 @@ stdenv.mkDerivation (finalAttrs: {
      --replace "revision = git.head().id" "revision = '${finalAttrs.version}'"
  '';

-  nativeBuildInputs = [ gradle makeWrapper ];
+  nativeBuildInputs = [
+    gradle
+    makeWrapper
+  ];

  mitmCache = gradle.fetchDeps {
    inherit (finalAttrs) pname;
--- 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/mv/mvt/package.nix
+++ b/pkgs/by-name/mv/mvt/package.nix
@ -0,0 +1,51 @@
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "mvt";
+  pyproject = true;
+  version = "2.5.4";
+
+  src = fetchFromGitHub {
+    owner = "mvt-project";
+    repo = "mvt";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-xDUjyvOsiweRqibTe7V8I/ABeaahCoR/d5w23qixp9A";
+  };
+
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
+    adb-shell
+    appdirs
+    click
+    cryptography
+    libusb1
+    iosbackup
+    packaging
+    pyahocorasick
+    pyyaml
+    requests
+    rich
+    simplejson
+    tld
+  ];
+
+  nativeCheckInputs = with python3.pkgs; [
+    pytestCheckHook
+    pytest-mock
+    stix2
+  ];
+
+  meta = {
+    description = "Tool to facilitate the consensual forensic analysis of Android and iOS devices";
+    homepage = "https://docs.mvt.re/en/latest/";
+    # https://github.com/mvt-project/mvt/blob/main/LICENSE
+    license = lib.licenses.unfree;
+    changelog = "https://github.com/mvt-project/mvt/releases/tag/v${version}";
+    maintainers = with lib.maintainers; [ PapayaJackal ];
+  };
+}
--- 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/Show More
+++ b/Show More