Merge master into staging-next

2025-08-03 06:05:54 +00:00
parent 4890c8c389 c148f7b964
commit 9e306e7a1d
20 changed files with 241 additions and 157 deletions
@@ -47,6 +47,8 @@
  The binary name remains `webfontkitgenerator`.
  The `webfontkitgenerator` package is an alias to `webfont-bundler`.

+- `inspircd` has been updated to the v4 release series. Please refer to the upstream documentation for [general information](https://docs.inspircd.org/4/overview/#v4-overview) and a list of [breaking changes](https://docs.inspircd.org/4/breaking-changes/).
+
 - `lima` package now only includes the guest agent for the host's architecture by default. If your guest VM's architecture differs from your Lima host's, you'll need to enable the `lima-additional-guestagents` package by setting `withAdditionalGuestAgents = true` when overriding lima with this input.

 - `vmware-horizon-client` was renamed to `omnissa-horizon-client`, following [VMware's sale of their end-user business to Omnissa](https://www.omnissa.com/insights/introducing-omnissa-the-former-vmware-end-user-computing-business/). The binary has been renamed from `vmware-view` to `horizon-client`.
@@ -53,14 +53,22 @@ in
  config = lib.mkIf cfg.enable {
    systemd.services.inspircd = {
      description = "InspIRCd - the stable, high-performance and modular Internet Relay Chat Daemon";
+      unitConfig.Documentation = "https://docs.inspircd.org";
      wantedBy = [ "multi-user.target" ];
-      requires = [ "network.target" ];
+
+      after = [
+        "network.target"
+        "network-online.target"
+      ];
+      wants = [ "network-online.target" ];

      serviceConfig = {
        Type = "simple";
        ExecStart = ''
-          ${lib.getBin cfg.package}/bin/inspircd start --config ${configFile} --nofork --nopid
+          ${lib.getBin cfg.package}/bin/inspircd --config ${configFile} --nofork --nopid
        '';
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        Restart = "on-failure";
        DynamicUser = true;
      };
    };
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "mednafen-pce-fast";
-  version = "0-unstable-2025-07-18";
+  version = "0-unstable-2025-08-01";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "beetle-pce-fast-libretro";
-    rev = "71675959c7df0f4235a90e6eeb271bf7c1bde019";
-    hash = "sha256-4pHPNRc34IEj+4YkKsXuUWK5yZri3+AJasn0aSOpfYY=";
+    rev = "c95e401e1dd37522b6d84d0017702cfece2be840";
+    hash = "sha256-xCjavWWWyNTnJyzCr+N2l3On2iflg+HzXCxOxLZvSew=";
  };

  makefile = "Makefile";
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "stella";
-  version = "0-unstable-2025-06-26";
+  version = "0-unstable-2025-07-28";

  src = fetchFromGitHub {
    owner = "stella-emu";
    repo = "stella";
-    rev = "c6ce6e80e87c828701629980e8a7119f3b08c5ab";
-    hash = "sha256-403Z0W9OQYbb8+O8kSWbpHkqywVhXbqqIyfsGlgEi+M=";
+    rev = "211b4902d5b4440b0aa567dade4eebf77cd868aa";
+    hash = "sha256-l2b2Lu9l5CwmfDsJazOdQ9mowxfAqJY4SEgtDxCnYxY=";
  };

  makefile = "Makefile";
@@ -1,18 +1,11 @@
 {
  lib,
-  python,
  installShellFiles,
-  buildPythonApplication,
  fetchFromGitHub,
-  boto3,
-  colorama,
-  psutil,
-  pluggy,
-  pyyaml,
-  setuptools,
+  python3Packages,
 }:

-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
  pname = "awsume";
  version = "4.5.5";
  format = "setuptools";
@@ -20,15 +13,15 @@ buildPythonApplication rec {
  src = fetchFromGitHub {
    owner = "trek10inc";
    repo = "awsume";
-    rev = version;
-    sha256 = "sha256-lm9YANYckyHDoNbB1wytBm55iyBmUuxFPmZupfpReqc=";
+    tag = version;
+    hash = "sha256-lm9YANYckyHDoNbB1wytBm55iyBmUuxFPmZupfpReqc=";
  };

  AWSUME_SKIP_ALIAS_SETUP = 1;

  nativeBuildInputs = [ installShellFiles ];

-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
    colorama
    boto3
    psutil
@@ -45,20 +38,20 @@ buildPythonApplication rec {

  postInstall = ''
    installShellCompletion --cmd awsume \
-      --bash <(PYTHONPATH=./awsume/configure ${python}/bin/python3 -c"import autocomplete; print(autocomplete.SCRIPTS['bash'])") \
-      --zsh <(PYTHONPATH=./awsume/configure ${python}/bin/python3 -c"import autocomplete; print(autocomplete.ZSH_AUTOCOMPLETE_FUNCTION)") \
-      --fish <(PYTHONPATH=./awsume/configure ${python}/bin/python3 -c"import autocomplete; print(autocomplete.SCRIPTS['fish'])") \
+      --bash <(PYTHONPATH=./awsume/configure python3 -c"import autocomplete; print(autocomplete.SCRIPTS['bash'])") \
+      --zsh <(PYTHONPATH=./awsume/configure python3 -c"import autocomplete; print(autocomplete.ZSH_AUTOCOMPLETE_FUNCTION)") \
+      --fish <(PYTHONPATH=./awsume/configure python3 -c"import autocomplete; print(autocomplete.SCRIPTS['fish'])") \

    rm -f $out/bin/awsume.bat
  '';

  doCheck = false;

-  meta = with lib; {
+  meta = {
    description = "Utility for easily assuming AWS IAM roles from the command line";
    homepage = "https://github.com/trek10inc/awsume";
-    license = [ licenses.mit ];
+    license = lib.licenses.mit;
    mainProgram = "awsume";
-    maintainers = [ maintainers.nilp0inter ];
+    maintainers = with lib.maintainers; [ nilp0inter ];
  };
 }
@@ -13,7 +13,7 @@

 stdenvNoCC.mkDerivation rec {
  pname = "cura-appimage";
-  version = "5.10.1";
+  version = "5.10.2";

  # Give some good names so the intermediate packages are easy
  # to recognise by name in the Nix store.
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {

  src = fetchurl {
    url = "https://github.com/Ultimaker/Cura/releases/download/${version}/Ultimaker-Cura-${version}-linux-X64.AppImage";
-    hash = "sha256-c89GkgfOSY4hriY66GUCgBYiiJJspM9Fg07lne+KXgw=";
+    hash = "sha256-930jrjNdUE0vxuMslQNbkdm2eLAFBSsVFxlTi56a8Xg=";
  };

  appimageContents = appimageTools.extract {
@@ -2,16 +2,14 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  buildPythonPackage,
+  python3Packages,
  webkitgtk_4_1,
  wrapGAppsHook3,
  glib-networking,
  gobject-introspection,
  openconnect,
-  pygobject3,
-  requests,
 }:
-buildPythonPackage rec {
+python3Packages.buildPythonPackage rec {
  pname = "gp-saml-gui";
  version = "0.1+20240731-${lib.strings.substring 0 7 src.rev}";
  format = "setuptools";
@@ -20,7 +18,7 @@ buildPythonPackage rec {
    owner = "dlenski";
    repo = "gp-saml-gui";
    rev = "c46af04b3a6325b0ecc982840d7cfbd1629b6d43";
-    sha256 = "sha256-4MFHad1cuCWawy2hrqdXOgud0pXpYiV9J3Jwqyg4Udk=";
+    hash = "sha256-4MFHad1cuCWawy2hrqdXOgud0pXpYiV9J3Jwqyg4Udk=";
  };

  buildInputs = lib.optional stdenv.hostPlatform.isLinux glib-networking;
@@ -31,12 +29,16 @@ buildPythonPackage rec {
    glib-networking
  ];

-  propagatedBuildInputs = [
-    requests
-    pygobject3
-    openconnect
-  ]
-  ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1;
+  dependencies =
+    with python3Packages;
+    [
+      requests
+      pygobject3
+    ]
+    ++ [
+      openconnect
+    ]
+    ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1;

  preFixup = ''
    gappsWrapperArgs+=(
@@ -44,11 +46,11 @@ buildPythonPackage rec {
    )
  '';

-  meta = with lib; {
+  meta = {
    description = "Interactively authenticate to GlobalProtect VPNs that require SAML";
    mainProgram = "gp-saml-gui";
    homepage = "https://github.com/dlenski/gp-saml-gui";
-    license = licenses.gpl3Only;
-    maintainers = [ maintainers.pallix ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ pallix ];
  };
 }
@@ -31,6 +31,7 @@ let

  # compatible if libc is compatible
  libcModules = [
+    "log_syslog"
    "regex_posix"
    "sslrehashsignal"
  ];
@@ -50,12 +51,11 @@ let
      # GPLv2 compatible dependencies
      "argon2"
      "ldap"
+      "log_json"
      "mysql"
      "pgsql"
-      "regex_pcre"
      "regex_pcre2"
      "regex_re2"
-      "regex_tre"
      "sqlite3"
      "ssl_gnutls"
    ]
@@ -70,19 +70,19 @@ in
  nixosTests,
  perl,
  pkg-config,
+  http-parser,
+  utf8cpp,
  libargon2,
  openldap,
  libpq,
  libmysqlclient,
-  pcre,
  pcre2,
-  tre,
  re2,
  sqlite,
  gnutls,
  libmaxminddb,
  openssl,
-  mbedtls,
+  yyjson,
  # For a full list of module names, see https://docs.inspircd.org/packaging/
  extraModules ? compatibleModules lib stdenv,
 }:
@@ -104,12 +104,12 @@ let
      )
    ];
    ldap = [ openldap ];
+    log_json = [ yyjson ];
+    log_syslog = [ ];
    mysql = [ libmysqlclient ];
    pgsql = [ libpq ];
-    regex_pcre = [ pcre ];
    regex_pcre2 = [ pcre2 ];
    regex_re2 = [ re2 ];
-    regex_tre = [ tre ];
    sqlite3 = [ sqlite ];
    ssl_gnutls = [ gnutls ];
    # depends on stdenv.cc.libc
@@ -119,7 +119,6 @@ let
    regex_stdlib = [ ];
    # GPLv2 incompatible
    geo_maxmind = [ libmaxminddb ];
-    ssl_mbedtls = [ mbedtls ];
    ssl_openssl = [ openssl ];
  };

@@ -151,13 +150,13 @@ in

 stdenv.mkDerivation rec {
  pname = "inspircd";
-  version = "3.18.0";
+  version = "4.8.0";

  src = fetchFromGitHub {
    owner = "inspircd";
    repo = "inspircd";
    rev = "v${version}";
-    sha256 = "sha256-Aulhg2CbtcpsxkH5kXkp4EoZF5/F9pOXJc1S08S5P08=";
+    sha256 = "sha256-fMfsNbkp9M8KiuhwOEFmPjowZ4JLP4IpX6LRO9aLHzY=";
  };

  outputs = [
@@ -175,7 +174,18 @@ stdenv.mkDerivation rec {
  ++ lib.optionals (lib.elem "pgsql" extraModules) [
    libpq.pg_config
  ];
-  buildInputs = extraInputs;
+
+  # Disable use of the vendored versions of these libraries
+  env = {
+    SYSTEM_HTTP_PARSER = "1";
+    SYSTEM_UTFCPP = "1";
+  };
+
+  buildInputs = [
+    http-parser
+    utf8cpp
+  ]
+  ++ extraInputs;

  configurePhase = ''
    runHook preConfigure
@@ -192,8 +202,7 @@ stdenv.mkDerivation rec {
    ./configure \
      --disable-auto-extras \
      --distribution-label nixpkgs${version} \
-      --uid 0 \
-      --gid 0 \
+      --disable-ownership \
      --binary-dir  ${placeholder "bin"}/bin \
      --config-dir  /etc/inspircd \
      --data-dir    ${placeholder "lib"}/lib/inspircd \
@@ -1,30 +1,28 @@
 {
  lib,
-  mkDerivation,
+  stdenv,
  fetchurl,
  cmake,
-  extra-cmake-modules,
-  karchive,
-  kconfigwidgets,
-  kcoreaddons,
-  ki18n,
-  kxmlgui,
-  qtkeychain,
+  libsForQt5,
 }:
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "ktextaddons";
  version = "1.3.2";

  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz";
+    url = "mirror://kde/stable/ktextaddons/ktextaddons-${finalAttrs.version}.tar.xz";
    hash = "sha256-mB7Hh2Ljrg8D2GxDyHCa1s6CVmg5DDkhwafEqtSqUeM=";
  };

  nativeBuildInputs = [
    cmake
+  ]
+  ++ (with libsForQt5; [
    extra-cmake-modules
-  ];
-  buildInputs = [
+    wrapQtAppsHook
+  ]);
+
+  buildInputs = with libsForQt5; [
    karchive
    kconfigwidgets
    kcoreaddons
@@ -33,10 +31,10 @@ mkDerivation rec {
    qtkeychain
  ];

-  meta = with lib; {
+  meta = {
    description = "Various text handling addons for KDE applications";
    homepage = "https://invent.kde.org/libraries/ktextaddons/";
-    license = licenses.gpl2Plus;
-    maintainers = [ ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ ];
  };
-}
+})
@@ -9,14 +9,11 @@
  opencolorio,
  ffmpeg_6,
  cmake,
-  wrapQtAppsHook,
  openimageio,
  openexr,
  portaudio,
  imath,
-  qtwayland,
-  qtmultimedia,
-  qttools,
+  qt6,
 }:

 let
@@ -71,7 +68,7 @@ stdenv.mkDerivation {
    pkg-config
    which
    cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
  ];

  buildInputs = [
@@ -82,18 +79,18 @@ stdenv.mkDerivation {
    imath
    openexr
    portaudio
-    qtwayland
-    qtmultimedia
-    qttools
+    qt6.qtwayland
+    qt6.qtmultimedia
+    qt6.qttools
  ];

-  meta = with lib; {
+  meta = {
    description = "Professional open-source NLE video editor";
    homepage = "https://www.olivevideoeditor.org/";
    downloadPage = "https://www.olivevideoeditor.org/download.php";
-    license = licenses.gpl3;
-    maintainers = [ maintainers.balsoft ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ balsoft ];
+    platforms = lib.platforms.unix;
    # never built on aarch64-darwin since first introduction in nixpkgs
    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
    mainProgram = "olive-editor";
@@ -53,6 +53,9 @@ buildGoModule (finalAttrs: {
        # This test depends on the metrics available in go not changing. This is a bit
        # too unstable for us updating go independently.
        "TestJSONSerialization"
+
+        # Flaky
+        "TestGraphQLParseSchemaAlloc"
      ]
      ++ lib.optionals stdenv.hostPlatform.isDarwin [
        # Skip tests that require network, not available in the darwin sandbox
@@ -1,38 +1,37 @@
 {
-  mkDerivation,
+  stdenv,
  cmake,
  fetchFromGitHub,
  lib,
  libGLU,
  makeDesktopItem,
-  qtbase,
-  wrapQtAppsHook,
+  qt5,
 }:

-mkDerivation rec {
+stdenv.mkDerivation rec {
  pname = "plater";
-  version = "2020-07-30";
+  version = "1.0.0-unstable-2025-03-24";

  src = fetchFromGitHub {
    owner = "Rhoban";
    repo = "Plater";
-    rev = "f8de6d038f95a9edebfcfe142c8e9783697d5b47";
-    sha256 = "0r20mbzd16zv1aiadjqdy7z6sp09rr6lgfxhvir4ll3cpakkynr4";
+    rev = "6c4f924504979095b1b45cf8fd81b1e38f0f8642";
+    hash = "sha256-+iL5Gl7k4lPikRwkyhaXSEcFYmhXV4ubAvP3iTBXDO8=";
  };

  nativeBuildInputs = [
    cmake
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
  ];
  buildInputs = [
    libGLU
-    qtbase
+    qt5.qtbase
  ];

  desktopItem = makeDesktopItem {
-    name = pname;
-    exec = pname;
-    icon = pname;
+    name = "plater";
+    exec = "plater";
+    icon = "plater";
    desktopName = "Ideamaker";
    genericName = meta.description;
    categories = [
@@ -47,11 +46,11 @@ mkDerivation rec {
    cp $src/gui/img/plater.png $out/share/pixmaps/${pname}.png
  '';

-  meta = with lib; {
+  meta = {
    description = "3D-printer parts placer and plate generator";
    homepage = "https://github.com/Rhoban/Plater";
-    maintainers = with maintainers; [ lovesegfault ];
-    platforms = platforms.linux;
-    license = licenses.cc-by-nc-30;
+    maintainers = with lib.maintainers; [ lovesegfault ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.cc-by-nc-30;
  };
 }
@@ -1,18 +1,10 @@
 {
  lib,
-  buildPythonApplication,
+  python3Packages,
  fetchFromGitLab,
-  requests,
-  lxml,
-  cssselect,
-  curlify,
-  poetry-core,
-  pytest-mock,
-  responses,
-  pytestCheckHook,
 }:

-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
  pname = "pricehist";
  version = "1.4.7";
  format = "pyproject";
@@ -20,32 +12,32 @@ buildPythonApplication rec {
  src = fetchFromGitLab {
    owner = "chrisberkhout";
    repo = "pricehist";
-    rev = version;
+    tag = version;
    hash = "sha256-SBRJxNnA+nOxO6h97WZZHwhxoXeNtb5+rDayn4Hw6so=";
  };

-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
    requests
    lxml
    cssselect
    curlify
+  ];
+
+  build-system = with python3Packages; [
    poetry-core
  ];

-  nativeBuildInputs = [
-  ];
-
-  nativeCheckInputs = [
+  nativeCheckInputs = with python3Packages; [
    responses
    pytest-mock
    pytestCheckHook
  ];

-  meta = with lib; {
+  meta = {
    description = "Command-line tool for fetching and formatting historical price data, with support for multiple data sources and output formats";
    homepage = "https://gitlab.com/chrisberkhout/pricehist";
-    license = licenses.mit;
+    license = lib.licenses.mit;
    mainProgram = "pricehist";
-    maintainers = with maintainers; [ chrpinedo ];
+    maintainers = with lib.maintainers; [ chrpinedo ];
  };
 }
@@ -18,11 +18,11 @@
 stdenv.mkDerivation (finalAttrs: {
  pname = "qownnotes";
  appname = "QOwnNotes";
-  version = "25.7.8";
+  version = "25.7.9";

  src = fetchurl {
    url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-NPejWX8/Wekbp6ht1i0MayC6R/9TBykQ2cqXAsqR1CY=";
+    hash = "sha256-rcBuGkoRel998i34e1kO8h/lqMZtgKnAipKGEF6xrhs=";
  };

  nativeBuildInputs = [
@@ -52,7 +52,7 @@

 stdenv.mkDerivation rec {
  pname = "root";
-  version = "6.36.00";
+  version = "6.36.02";

  passthru = {
    tests = import ./tests { inherit callPackage; };
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
-    hash = "sha256-lK/I3vkoQmeaEwonUhvmbiq9qjdiCIjmHYKKQ/xLAaI=";
+    hash = "sha256-UQ1nezOsfKSKoNcSvbiNg1of9qN074bxoeFo+ieetHA=";
  };

  clad_src = fetchFromGitHub {
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
    patchRcPathFish
    patchRcPathPosix
    pcre2
-    python3.pkgs.numpy
+    python3
    tbb
    xrootd
    xxHash
@@ -162,18 +162,15 @@ stdenv.mkDerivation rec {

  cmakeFlags = [
    "-DCLAD_SOURCE_DIR=${clad_src}"
-    "-DCMAKE_INSTALL_BINDIR=bin"
-    "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    "-DCMAKE_INSTALL_LIBDIR=lib"
    "-DClang_DIR=${clang}/lib/cmake/clang"
    "-Dbuiltin_clang=OFF"
    "-Dbuiltin_llvm=OFF"
    "-Dfail-on-missing=ON"
    "-Dfftw3=ON"
    "-Dfitsio=OFF"
-    "-Dgnuinstall=ON"
    "-Dmathmore=ON"
    "-Dsqlite=OFF"
+    "-Dtmva-pymva=OFF"
    "-Dvdt=OFF"
  ]
  ++ lib.optionals stdenv.hostPlatform.isDarwin [
@@ -35,8 +35,10 @@ stdenv.mkDerivation rec {
  ];

  # The test suite seems to have some glibc malloc hooks that don't exist/link on macOS
-  # With pkgsLLVM: tests/test-winmsgcond.c:53: assertion 'wmc_end(&wmc, pos + 1, &chg) == pos' failed
-  doCheck = !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.useLLVM;
+  # With pkgsLLVM / on loongarch64-linux:
+  #   tests/test-winmsgcond.c:53: assertion 'wmc_end(&wmc, pos + 1, &chg) == pos' failed
+  doCheck =
+    !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.useLLVM && !stdenv.hostPlatform.isLoongArch64;

  meta = with lib; {
    homepage = "https://www.gnu.org/software/screen/";
@@ -0,0 +1,98 @@
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchFromGitHub,
+  gnumake,
+  pkg-config,
+  gtk3,
+  rubyPackages,
+  tor,
+  mumble,
+  installShellFiles,
+  wrapGAppsHook3,
+  writableTmpDirAsHomeHook,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "wahay";
+  version = "0.2";
+
+  src = fetchFromGitHub {
+    owner = "digitalautonomy";
+    repo = "wahay";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-59gVGDElIs+OQ/ELwOFjz6YqG18iHqoa2yYF2Ddi0/o=";
+  };
+
+  vendorHash = "sha256-w8lUnvy5dPMHWbzyyTq9Q/kE/4vSuOHffaY9CeasvQ0=";
+
+  buildInputs = [
+    gtk3
+  ];
+
+  nativeBuildInputs = [
+    gnumake
+    pkg-config
+    rubyPackages.sass
+    installShellFiles
+    wrapGAppsHook3
+  ];
+
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+  ];
+
+  postPatch = ''
+    # Avoid Git invocation: Remove assignments starting with ‘$(shell git’
+    sed -E -i \
+      -e '/^\w+\s*[+:]?=\s*\$\(shell\s+git\>/d' \
+      Makefile
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+    make TAG_VERSION=v${finalAttrs.version} \
+         BUILD_TIMESTAMP="$(date -u -d "@$SOURCE_DATE_EPOCH" '+%Y-%m-%d %H:%M:%S')" \
+         build
+    runHook postBuild
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+    make test
+    runHook postCheck
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    installBin bin/wahay
+    installManPage packaging/ubuntu/ubuntu/usr/share/man/man1/wahay.1.gz
+    runHook postInstall
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix PATH : ${
+        lib.escapeShellArg (
+          lib.makeBinPath [
+            tor
+            mumble
+          ]
+        )
+      }
+    )
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    broken = stdenv.hostPlatform.isDarwin;
+    description = "Decentralized encrypted conference call application";
+    homepage = "https://wahay.org/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dvn0 ];
+    mainProgram = "wahay";
+  };
+})
@@ -3,7 +3,7 @@
  stdenvNoCC,
  fetchFromGitHub,
  gtk3,
-  breeze-icons,
+  libsForQt5,
  gnome-icon-theme,
  numix-icon-theme,
  numix-icon-theme-circle,
@@ -12,15 +12,15 @@
  gitUpdater,
 }:

-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "zafiro-icons";
  version = "1.3";

  src = fetchFromGitHub {
    owner = "zayronxio";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-IbFnlUOSADYMNMfvRuRPndxcQbnV12BqMDb9bJRjnoU=";
+    repo = "zafiro-icons";
+    tag = finalAttrs.version;
+    hash = "sha256-IbFnlUOSADYMNMfvRuRPndxcQbnV12BqMDb9bJRjnoU=";
  };

  nativeBuildInputs = [
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec {
  ];

  propagatedBuildInputs = [
-    breeze-icons
+    libsForQt5.breeze-icons
    gnome-icon-theme
    numix-icon-theme
    numix-icon-theme-circle
@@ -67,11 +67,11 @@ stdenvNoCC.mkDerivation rec {

  passthru.updateScript = gitUpdater { };

-  meta = with lib; {
+  meta = {
    description = "Icon pack flat with light colors";
    homepage = "https://github.com/zayronxio/Zafiro-icons";
-    license = with licenses; [ gpl3 ];
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ romildo ];
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ romildo ];
  };
-}
+})
@@ -20,7 +20,7 @@ callPackage ./build.nix rec {
    # Fix case-sensitive filesystems issue when save/load games
    (fetchpatch2 {
      url = "https://github.com/alexbatalov/fallout2-ce/commit/d843a662b3ceaf01ac363e9abb4bfceb8b805c36.patch";
-      sha256 = "sha256-u4E9+DE6sGYikIGwKDmSBj3ErCfIo6YzIw2eMiqXw/E=";
+      sha256 = "sha256-r4sfl1JolWRNd2xcf4BMCxZw3tbN21UJW4TdyIbQzgs=";
    })
  ];

@@ -1085,8 +1085,6 @@ with pkgs;
    }
  );

-  gp-saml-gui = python3Packages.callPackage ../tools/networking/gp-saml-gui { };
-
  inherit (callPackages ../tools/networking/ivpn/default.nix { })
    ivpn
    ivpn-service
@@ -1123,8 +1121,6 @@ with pkgs;
    withUsdView = true;
  };

-  pricehist = python3Packages.callPackage ../tools/misc/pricehist { };
-
  py7zr = with python3Packages; toPythonApplication py7zr;

  qFlipper = libsForQt5.callPackage ../tools/misc/qflipper { };
@@ -1612,8 +1608,6 @@ with pkgs;

  autoflake = with python3.pkgs; toPythonApplication autoflake;

-  awsume = python3Packages.callPackage ../tools/admin/awsume { };
-
  aws-mfa = python3Packages.callPackage ../tools/admin/aws-mfa { };

  azure-cli-extensions = recurseIntoAttrs azure-cli.extensions;
@@ -3880,8 +3874,6 @@ with pkgs;
    protobuf = protobuf_21;
  };

-  olive-editor = qt6Packages.callPackage ../applications/video/olive-editor { };
-
  ome_zarr = with python3Packages; toPythonApplication ome-zarr;

  onlykey = callPackage ../tools/security/onlykey { node_webkit = nwjs; };
@@ -8437,8 +8429,6 @@ with pkgs;
  };
  libkrb5 = krb5; # TODO(de11n) Try to make krb5 reuse libkrb5 as a dependency

-  ktextaddons = libsForQt5.callPackage ../development/libraries/ktextaddons { };
-
  l-smash = callPackage ../development/libraries/l-smash {
    stdenv = gccStdenv;
  };
@@ -11612,10 +11602,6 @@ with pkgs;

  xlsx2csv = with python3Packages; toPythonApplication xlsx2csv;

-  zafiro-icons = callPackage ../data/icons/zafiro-icons {
-    inherit (plasma5Packages) breeze-icons;
-  };
-
  zeal-qt5 = libsForQt5.callPackage ../data/documentation/zeal { };
  zeal = zeal-qt5;
  zeal-qt6 = qt6Packages.callPackage ../data/documentation/zeal {
@@ -13303,8 +13289,6 @@ with pkgs;

  pineapple-pictures = qt6Packages.callPackage ../applications/graphics/pineapple-pictures { };

-  plater = libsForQt5.callPackage ../applications/misc/plater { };
-
  plexamp = callPackage ../applications/audio/plexamp { };

  plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { };