qt5.qtwebkit: drop (#513769)

2026-04-26 20:06:14 +00:00
parent fa287c201f 9a808c298b
commit 157a9b2247
43 changed files with 16 additions and 2248 deletions
@@ -12,11 +12,10 @@
  # unwrapped package parameters
  withGrass ? false,
  withServer ? false,
-  withWebKit ? false,
 }:
 let
  qgis-ltr-unwrapped = libsForQt5.callPackage ./unwrapped-ltr.nix {
-    inherit withGrass withServer withWebKit;
+    inherit withGrass withServer;
  };
 in

@@ -11,7 +11,6 @@

  withGrass,
  withServer,
-  withWebKit,

  darwin,
  libtasn1,
@@ -45,7 +44,6 @@
  qtsensors,
  qtserialport,
  qtsvg,
-  qtwebkit,
  qtxmlpatterns,
  qwt,
  sqlite,
@@ -150,7 +148,6 @@ mkDerivation rec {
    zstd
  ]
  ++ lib.optional withGrass grass
-  ++ lib.optional withWebKit qtwebkit
  ++ lib.optional stdenv.hostPlatform.isDarwin libtasn1
  ++ pythonBuildInputs;

@@ -180,12 +177,14 @@ mkDerivation rec {

    # See https://github.com/libspatialindex/libspatialindex/issues/276
    "-DWITH_INTERNAL_SPATIALINDEX=True"
+
+    # Unmaintained & not in nixpkgs
+    "-DWITH_QTWEBKIT=OFF"
  ]
  ++ lib.optionals stdenv.hostPlatform.isDarwin [
    "-DQGIS_MACAPP_BUNDLE=0" # Don't copy Qt into bundle; we fix paths in postFixup
    "-DSQLITE3_INCLUDE_DIR=${sqlite.dev}/include" # FindSqlite3.cmake incorrectly assumes framework
  ]
-  ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
  ++ lib.optional withServer [
    "-DWITH_SERVER=True"
    "-DQGIS_CGIBIN_SUBDIR=${placeholder "out"}/lib/cgi-bin"
@@ -1,49 +0,0 @@
-diff --git i/config.cc w/config.cc
-index 04b63f5..7a453d9 100644
--- i/config.cc
-+++ w/config.cc
-@@ -182,7 +182,7 @@ Preferences::Preferences():
-   pronounceOnLoadPopup( false ),
-   useInternalPlayer( InternalPlayerBackend::anyAvailable() ),
-   internalPlayerBackend( InternalPlayerBackend::defaultBackend() ),
-  checkForNewReleases( true ),
-+  checkForNewReleases( false ),
-   disallowContentFromOtherSites( false ),
-   enableWebPlugins( false ),
-   hideGoldenDictHeader( false ),
-@@ -867,8 +867,8 @@ Class load() THROW_SPEC( exError )
-       c.preferences.proxyServer.systemProxyPassword = proxy.namedItem( "systemProxyPassword" ).toElement().text();
-     }
- 
-    if ( !preferences.namedItem( "checkForNewReleases" ).isNull() )
-      c.preferences.checkForNewReleases = ( preferences.namedItem( "checkForNewReleases" ).toElement().text() == "1" );
-+    //if ( !preferences.namedItem( "checkForNewReleases" ).isNull() )
-+    //  c.preferences.checkForNewReleases = ( preferences.namedItem( "checkForNewReleases" ).toElement().text() == "1" );
- 
-     if ( !preferences.namedItem( "disallowContentFromOtherSites" ).isNull() )
-       c.preferences.disallowContentFromOtherSites = ( preferences.namedItem( "disallowContentFromOtherSites" ).toElement().text() == "1" );
-@@ -1819,9 +1819,9 @@ void save( Class const & c ) THROW_SPEC( exError )
-       proxy.appendChild( opt );
-     }
- 
-    opt = dd.createElement( "checkForNewReleases" );
-    opt.appendChild( dd.createTextNode( c.preferences.checkForNewReleases ? "1" : "0" ) );
-    preferences.appendChild( opt );
-+    //opt = dd.createElement( "checkForNewReleases" );
-+    //opt.appendChild( dd.createTextNode( c.preferences.checkForNewReleases ? "1" : "0" ) );
-+    //preferences.appendChild( opt );
- 
-     opt = dd.createElement( "disallowContentFromOtherSites" );
-     opt.appendChild( dd.createTextNode( c.preferences.disallowContentFromOtherSites ? "1" : "0" ) );
-diff --git i/preferences.cc w/preferences.cc
-index 72c3147..7e48f00 100644
--- i/preferences.cc
-+++ w/preferences.cc
-@@ -314,6 +314,7 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
-            this, SLOT( customProxyToggled( bool ) ) );
- 
-   ui.checkForNewReleases->setChecked( p.checkForNewReleases );
-+  ui.checkForNewReleases->setEnabled( false );
-   ui.disallowContentFromOtherSites->setChecked( p.disallowContentFromOtherSites );
-   ui.enableWebPlugins->setChecked( p.enableWebPlugins );
-   ui.hideGoldenDictHeader->setChecked( p.hideGoldenDictHeader );
@@ -1,62 +0,0 @@
-diff --git i/goldendict.pro w/goldendict.pro
-index 4a4a3094..082b728f 100644
--- i/goldendict.pro
-+++ w/goldendict.pro
-@@ -212,22 +212,19 @@ mac {
-         -llzo2
-     !CONFIG( no_ffmpeg_player ) {
-         LIBS += -lao \
-            -lswresample-gd \
-            -lavutil-gd \
-            -lavformat-gd \
-            -lavcodec-gd
-+            -lswresample \
-+            -lavutil \
-+            -lavformat \
-+            -lavcodec
-     }
-    INCLUDEPATH = $${PWD}/maclibs/include
-    LIBS += -L$${PWD}/maclibs/lib -framework AppKit -framework Carbon
-+    LIBS += -framework AppKit -framework Carbon
-     OBJECTIVE_SOURCES += lionsupport.mm \
-                          machotkeywrapper.mm \
-                          macmouseover.mm \
-                          speechclient_mac.mm
-     ICON = icons/macicon.icns
-     QMAKE_INFO_PLIST = myInfo.plist
-    QMAKE_POST_LINK = mkdir -p GoldenDict.app/Contents/Frameworks & \
-                      cp -nR $${PWD}/maclibs/lib/ GoldenDict.app/Contents/Frameworks/ & \
-                      mkdir -p GoldenDict.app/Contents/MacOS/locale & \
-+    QMAKE_POST_LINK = mkdir -p GoldenDict.app/Contents/MacOS/locale & \
-                       cp -R locale/*.qm GoldenDict.app/Contents/MacOS/locale/ & \
-                       mkdir -p GoldenDict.app/Contents/MacOS/help & \
-                       cp -R $${PWD}/help/*.qch GoldenDict.app/Contents/MacOS/help/
-@@ -235,15 +232,6 @@ mac {
-     CONFIG += zim_support
-     !CONFIG( no_chinese_conversion_support ) {
-         CONFIG += chinese_conversion_support
-        CONFIG( x86 ) {
-            QMAKE_POST_LINK += & mkdir -p GoldenDict.app/Contents/MacOS/opencc & \
-                                 cp -R $${PWD}/opencc/*.json GoldenDict.app/Contents/MacOS/opencc/ & \
-                                 cp -R $${PWD}/opencc/*.ocd GoldenDict.app/Contents/MacOS/opencc/
-        } else {
-            QMAKE_POST_LINK += & mkdir -p GoldenDict.app/Contents/MacOS/opencc & \
-                                 cp -R $${PWD}/opencc/x64/*.json GoldenDict.app/Contents/MacOS/opencc/ & \
-                                 cp -R $${PWD}/opencc/x64/*.ocd GoldenDict.app/Contents/MacOS/opencc/
-        }
-     }
- }
- DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\"
-diff --git i/tiff.cc w/tiff.cc
-index e3cb8bf5..95dd812f 100644
--- i/tiff.cc
-+++ w/tiff.cc
-@@ -5,7 +5,7 @@
- 
- #include "tiff.hh"
- 
-#if defined (Q_OS_MAC) || defined (Q_OS_WIN)
-+#if defined (Q_OS_WIN)
- #include "tiff/tiff.h"
- #include "tiff/tiffio.h"
- #else
@@ -1,116 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  pkg-config,
-  libxtst,
-  libvorbis,
-  hunspell,
-  lzo,
-  xz,
-  bzip2,
-  libiconv,
-  qtbase,
-  qtsvg,
-  qtwebkit,
-  qtx11extras,
-  qttools,
-  qmake,
-  wrapQtAppsHook,
-  wrapGAppsHook3,
-  withCC ? true,
-  opencc,
-  withEpwing ? true,
-  libeb,
-  withExtraTiff ? true,
-  libtiff,
-  withFFmpeg ? true,
-  libao,
-  ffmpeg,
-  withMultimedia ? true,
-  withZim ? true,
-  zstd,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "goldendict";
-  version = "1.5.0";
-
-  src = fetchFromGitHub {
-    owner = "goldendict";
-    repo = "goldendict";
-    rev = version;
-    hash = "sha256-80o8y+mbzpyMQYUGHYs/zgQT23nLVCs7Jcr8FbbXn8M=";
-  };
-
-  patches = [
-    ./0001-dont-check-for-updates.patch
-    ./0001-dont-use-maclibs.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace goldendict.pro \
-      --replace "hunspell-1.6.1" "hunspell-${lib.versions.majorMinor hunspell.version}" \
-      --replace "opencc.2" "opencc"
-  '';
-
-  nativeBuildInputs = [
-    pkg-config
-    qmake
-    wrapQtAppsHook
-    wrapGAppsHook3
-  ];
-  buildInputs = [
-    qtbase
-    qtsvg
-    qtwebkit
-    qttools
-    libvorbis
-    hunspell
-    xz
-    lzo
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [
-    qtx11extras
-    libxtst
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    bzip2
-    libiconv
-  ]
-  ++ lib.optional withCC opencc
-  ++ lib.optional withEpwing libeb
-  ++ lib.optional withExtraTiff libtiff
-  ++ lib.optionals withFFmpeg [
-    libao
-    ffmpeg
-  ]
-  ++ lib.optional withZim zstd;
-
-  qmakeFlags = [
-    "goldendict.pro"
-    (lib.optional withCC "CONFIG+=chinese_conversion_support")
-    (lib.optional (!withCC) "CONFIG+=no_chinese_conversion_support")
-    (lib.optional (!withEpwing) "CONFIG+=no_epwing_support")
-    (lib.optional (!withExtraTiff) "CONFIG+=no_extra_tiff_handler")
-    (lib.optional (!withFFmpeg) "CONFIG+=no_ffmpeg_player")
-    (lib.optional (!withMultimedia) "CONFIG+=no_qtmultimedia_player")
-    (lib.optional withZim "CONFIG+=zim_support")
-  ];
-
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mkdir -p $out/Applications
-    mv GoldenDict.app $out/Applications
-  '';
-
-  meta = {
-    homepage = "http://goldendict.org/";
-    description = "Feature-rich dictionary lookup program";
-    platforms = with lib.platforms; linux ++ darwin;
-    mainProgram = "goldendict";
-    maintainers = with lib.maintainers; [
-      sikmir
-    ];
-    license = lib.licenses.gpl3Plus;
-  };
-}
@@ -1,63 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  qmake,
-  wrapQtAppsHook,
-  boost,
-  qtbase,
-  qtwebkit,
-  poppler,
-  hunspell,
-  html-tidy,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "nixnote2";
-  version = "2.0.2";
-
-  src = fetchFromGitHub {
-    owner = "baumgarr";
-    repo = "nixnote2";
-    rev = "v${version}";
-    sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr";
-  };
-
-  nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    boost
-    qtbase
-    qtwebkit
-    poppler
-    hunspell
-  ];
-
-  postPatch = ''
-    # Fix location of poppler-qt5.h
-    for f in threads/indexrunner.cpp html/noteformatter.cpp utilities/noteindexer.cpp gui/plugins/popplerviewer.h gui/plugins/pluginfactory.h gui/plugins/popplerviewer.cpp ; do
-      substituteInPlace $f \
-        --replace '#include <poppler-qt5.h>' '#include <poppler/qt5/poppler-qt5.h>'
-    done
-
-    substituteInPlace help/about.html --replace '__VERSION__' '${version}'
-
-    substituteInPlace nixnote.cpp --replace 'tidyProcess.start("tidy' 'tidyProcess.start("${html-tidy}/bin/tidy'
-  '';
-
-  postInstall = ''
-    cp images/windowIcon.png $out/share/pixmaps/nixnote2.png
-    cp theme.ini $out/share/nixnote2/theme.ini
-  '';
-
-  meta = {
-    description = "Unofficial client of Evernote";
-    homepage = "http://www.nixnote.org/";
-    license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ htr ];
-    platforms = lib.platforms.linux;
-  };
-}
@@ -1,55 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  qtbase,
-  qttools,
-  qtx11extras,
-  qtmultimedia,
-  qtwebkit,
-  wrapQtAppsHook,
-  cmake,
-  openssl,
-  xorgproto,
-  libx11,
-  libxscrnsaver,
-  xz,
-  zlib,
-}:
-stdenv.mkDerivation {
-  pname = "vacuum-im";
-  version = "unstable-2021-12-09";
-
-  src = fetchFromGitHub {
-    owner = "Vacuum-IM";
-    repo = "vacuum-im";
-    rev = "0abd5e11dd3e2538b8c47f5a06febedf73ae99ee";
-    sha256 = "0l9pln07zz874m1r6wnpc9vcdbpgvjdsy49cjjilc6s4p4b2c812";
-  };
-
-  nativeBuildInputs = [
-    wrapQtAppsHook
-    cmake
-  ];
-  buildInputs = [
-    qtbase
-    qttools
-    qtx11extras
-    qtmultimedia
-    qtwebkit
-    openssl
-    xorgproto
-    libx11
-    libxscrnsaver
-    xz
-    zlib
-  ];
-
-  meta = {
-    description = "XMPP client fully composed of plugins";
-    maintainers = [ lib.maintainers.raskin ];
-    platforms = lib.platforms.linux;
-    license = lib.licenses.gpl3;
-    homepage = "http://www.vacuum-im.org";
-  };
-}
@@ -1,49 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  qmake,
-  pkg-config,
-  wrapQtAppsHook,
-  qtbase,
-  qttools,
-  qtwebkit,
-  sqlite,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "quiterss";
-  version = "0.19.4";
-
-  src = fetchFromGitHub {
-    owner = "QuiteRSS";
-    repo = "quiterss";
-    rev = version;
-    sha256 = "1cgvl67vhn5y7bj5gbjbgk26bhb0196bgrgsp3r5fmrislarj8s6";
-  };
-
-  nativeBuildInputs = [
-    qmake
-    pkg-config
-    wrapQtAppsHook
-  ];
-  buildInputs = [
-    qtbase
-    qttools
-    qtwebkit
-    sqlite.dev
-  ];
-
-  meta = {
-    description = "Qt-based RSS/Atom news feed reader";
-    longDescription = ''
-      QuiteRSS is a open-source cross-platform RSS/Atom news feeds reader
-      written on Qt/C++
-    '';
-    homepage = "https://quiterss.org";
-    changelog = "https://github.com/QuiteRSS/quiterss/blob/${version}/CHANGELOG";
-    license = lib.licenses.gpl3;
-    platforms = lib.platforms.linux;
-    maintainers = [ ];
-  };
-}
@@ -1,46 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  qmake,
-  qtbase,
-  qtwebkit,
-  qtx11extras,
-  lzo,
-  libx11,
-  wrapQtAppsHook,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "cb2bib";
-  version = "2.0.0";
-  src = fetchurl {
-    url = "https://www.molspaces.com/dl/progs/${pname}-${version}.tar.gz";
-    sha256 = "0gv7cnxi84lr6d5y71pd67h0ilmf5c88j1jxgyn9dvj19smrv99h";
-  };
-  buildInputs = [
-    qtbase
-    qtwebkit
-    qtx11extras
-    lzo
-    libx11
-  ];
-  nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
-  ];
-
-  configurePhase = ''
-    runHook preConfigure
-    ./configure --prefix $out --qmakepath $QMAKE
-    runHook postConfigure
-  '';
-
-  meta = {
-    description = "Rapidly extract unformatted, or unstandardized bibliographic references from email alerts, journal Web pages and PDF files";
-    homepage = "http://www.molspaces.com/d_cb2bib-overview.php";
-    maintainers = with lib.maintainers; [ edwtjo ];
-    license = lib.licenses.gpl3;
-  };
-
-}
@@ -1,51 +0,0 @@
-{
-  stdenv,
-  lib,
-  openmodelica,
-  symlinkJoin,
-  gnumake,
-  blas,
-  lapack,
-  makeWrapper,
-}:
-symlinkJoin {
-  name = "openmodelica-combined";
-  paths = with openmodelica; [
-    omcompiler
-    omsimulator
-    omplot
-    omparser
-    omedit
-    omlibrary
-    omshell
-  ];
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  postBuild = ''
-    wrapProgram $out/bin/OMEdit \
-      --prefix PATH : ${
-        lib.makeBinPath [
-          gnumake
-          stdenv.cc
-        ]
-      } \
-      --prefix LIBRARY_PATH : "${
-        lib.makeLibraryPath [
-          blas
-          lapack
-        ]
-      }" \
-      --set-default OPENMODELICALIBRARY "${openmodelica.omlibrary}/lib/omlibrary"
-  '';
-
-  meta = {
-    description = "Open-source Modelica-based modeling and simulation environment intended for industrial and academic usage";
-    homepage = "https://openmodelica.org";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [
-      balodja
-    ];
-    platforms = lib.platforms.linux;
-  };
-}
@@ -1,24 +0,0 @@
-{
-  lib,
-  newScope,
-  libsForQt5,
-  clangStdenv,
-}:
-lib.makeScope newScope (
-  self:
-  let
-    callPackage = self.newScope { stdenv = clangStdenv; };
-    callQtPackage = self.newScope (libsForQt5 // { stdenv = clangStdenv; });
-  in
-  {
-    mkOpenModelicaDerivation = callPackage ./mkderivation { };
-    omcompiler = callPackage ./omcompiler { };
-    omplot = callQtPackage ./omplot { };
-    omsimulator = callPackage ./omsimulator { };
-    omparser = callPackage ./omparser { };
-    omedit = callQtPackage ./omedit { };
-    omlibrary = callPackage ./omlibrary { };
-    omshell = callQtPackage ./omshell { };
-    combined = callPackage ./combined { };
-  }
-)
@@ -1,132 +0,0 @@
-# mkOpenModelicaDerivation is an mkDerivation function for packages
-# from OpenModelica suite.
-
-{
-  stdenv,
-  lib,
-  fetchgit,
-  autoconf,
-  automake,
-  libtool,
-  cmake,
-  autoreconfHook,
-  symlinkJoin,
-}:
-pkg:
-let
-  inherit (builtins)
-    hasAttr
-    getAttr
-    length
-    elemAt
-    ;
-  inherit (lib) attrByPath concatStringsSep;
-
-  # A few helpers functions:
-
-  # getAttrDef is just a getAttr with default fallback
-  getAttrDef =
-    attr: default: x:
-    attrByPath [ attr ] default x;
-
-  # getAttr-like helper for optional append to string:
-  # "Hello" + appendByAttr "a" " " {a = "world";} = "Hello world"
-  # "Hello" + appendByAttr "a" " " {} = "Hello"
-  appendByAttr =
-    attr: sep: x:
-    lib.optionalString (hasAttr attr x) (sep + (getAttr attr x));
-
-  # Are there any OM dependencies at all?
-  ifDeps = length pkg.omdeps != 0;
-
-  # Dependencies of current OpenModelica-target joined in one file tree.
-  # Return the dep itself in case it is a single one.
-  joinedDeps =
-    if length pkg.omdeps == 1 then
-      elemAt pkg.omdeps 0
-    else
-      symlinkJoin {
-        name = pkg.pname + "-omhome";
-        paths = pkg.omdeps;
-      };
-
-  # Should we run ./configure for the target pkg?
-  omautoconf = getAttrDef "omautoconf" false pkg;
-
-  # Name of the make target
-  omtarget = getAttrDef "omtarget" pkg.pname pkg;
-
-  # Directory of target sources
-  omdir = getAttrDef "omdir" pkg.pname pkg;
-
-  # Simple to to m4 configuration scripts
-  postPatch =
-    lib.optionalString ifDeps ''
-      sed -i ''$(find -name omhome.m4) -e 's|if test ! -z "$USINGPRESETBUILDDIR"|if test ! -z "$USINGPRESETBUILDDIR" -a -z "$OMHOME"|'
-    ''
-    + appendByAttr "postPatch" "\n" pkg;
-
-  # Update shebangs in the scripts before running configuration.
-  preAutoreconf = "patchShebangs --build common" + appendByAttr "preAutoreconf" "\n" pkg;
-
-  # Tell OpenModelica where built dependencies are located.
-  configureFlags =
-    lib.optional ifDeps "--with-openmodelicahome=${joinedDeps}" ++ getAttrDef "configureFlags" [ ] pkg;
-
-  # Our own configurePhase that accounts for omautoconf
-  configurePhase = ''
-    runHook preConfigure
-    export configureFlags="''${configureFlags} --with-ombuilddir=$PWD/build --prefix=$prefix"
-    ./configure --no-recursion $configureFlags
-    ${lib.optionalString omautoconf "(cd ${omdir}; ./configure $configureFlags)"}
-    runHook postConfigure
-  '';
-
-  # Targets that we want to build ourselves:
-  deptargets = lib.forEach pkg.omdeps (dep: dep.omtarget);
-
-  # ... so we ask openmodelica makefile to skip those targets.
-  preBuild = ''
-    for target in ${concatStringsSep " " deptargets}; do
-      touch ''${target}.skip;
-    done
-  ''
-  + appendByAttr "preBuild" "\n" pkg;
-
-  makeFlags = "${omtarget}" + appendByAttr "makeFlags" " " pkg;
-
-  installFlags = "-i " + appendByAttr "installFlags" " " pkg;
-
-in
-stdenv.mkDerivation (
-  pkg
-  // {
-    inherit
-      omtarget
-      postPatch
-      preAutoreconf
-      configureFlags
-      configurePhase
-      preBuild
-      makeFlags
-      installFlags
-      ;
-
-    src = fetchgit (import ./src-main.nix);
-    version = "1.18.0";
-
-    nativeBuildInputs = getAttrDef "nativeBuildInputs" [ ] pkg ++ [
-      autoconf
-      automake
-      libtool
-      cmake
-      autoreconfHook
-    ];
-
-    buildInputs = getAttrDef "buildInputs" [ ] pkg ++ lib.optional ifDeps joinedDeps;
-
-    dontUseCmakeConfigure = true;
-
-    hardeningDisable = [ "format" ];
-  }
-)
@@ -1,7 +0,0 @@
-{
-  url = "https://github.com/OpenModelica/OpenModelica/";
-  rev = "49be4faa5a625a18efbbd74cc2f5be86aeea37bb";
-  sha256 = "0klqiy4sdizl1djb9hb0arcvfcjz2mmnakrjx81mmxcbr8yq2016";
-  fetchSubmodules = true;
-}
-# Update with: nix run -f ./nixpkgs/default.nix nix-prefetch-git -c nix-prefetch-git 'https://github.com/OpenModelica/OpenModelica/' 'v1.18.0' --fetch-submodules
@@ -1,84 +0,0 @@
-{
-  stdenv,
-  lib,
-  gfortran,
-  flex,
-  bison,
-  jre8,
-  blas,
-  lapack,
-  curl,
-  readline,
-  expat,
-  pkg-config,
-  buildPackages,
-  targetPackages,
-  libffi,
-  binutils,
-  mkOpenModelicaDerivation,
-}:
-let
-  isCross = stdenv.buildPlatform != stdenv.hostPlatform;
-  nativeOMCompiler = buildPackages.openmodelica.omcompiler;
-in
-mkOpenModelicaDerivation (
-  {
-    pname = "omcompiler";
-    omtarget = "omc";
-    omdir = "OMCompiler";
-    omdeps = [ ];
-    omautoconf = true;
-
-    nativeBuildInputs = [
-      jre8
-      gfortran
-      flex
-      bison
-      pkg-config
-    ]
-    ++ lib.optional isCross nativeOMCompiler;
-
-    buildInputs = [
-      targetPackages.stdenv.cc.cc
-      blas
-      lapack
-      curl
-      readline
-      expat
-      libffi
-      binutils
-    ];
-
-    postPatch = ''
-      sed -i -e '/^\s*AR=ar$/ s/ar/${stdenv.cc.targetPrefix}ar/
-                 /^\s*ar / s/ar /${stdenv.cc.targetPrefix}ar /
-                 /^\s*ranlib/ s/ranlib /${stdenv.cc.targetPrefix}ranlib /' \
-          $(find ./OMCompiler -name 'Makefile*')
-    '';
-
-    env.CFLAGS = toString [
-      "-Wno-error=dynamic-exception-spec"
-      "-Wno-error=implicit-function-declaration"
-    ];
-
-    preFixup = ''
-      for entry in $(find $out -name libipopt.so); do
-        patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$entry"
-        patchelf --set-rpath '$ORIGIN':"$(patchelf --print-rpath $entry)" "$entry"
-      done
-    '';
-
-    meta = {
-      description = "Modelica compiler from OpenModelica suite";
-      homepage = "https://openmodelica.org";
-      license = lib.licenses.gpl3Only;
-      maintainers = with lib.maintainers; [
-        balodja
-      ];
-      platforms = lib.platforms.linux;
-    };
-  }
-  // lib.optionalAttrs isCross {
-    configureFlags = [ "--with-omc=${nativeOMCompiler}/bin/omc" ];
-  }
-)
@@ -1,58 +0,0 @@
-{
-  lib,
-  jre8,
-  qmake,
-  qtbase,
-  qttools,
-  qtwebkit,
-  qtxmlpatterns,
-  binutils,
-  wrapQtAppsHook,
-  openmodelica,
-  openscenegraph,
-  mkOpenModelicaDerivation,
-}:
-with openmodelica;
-mkOpenModelicaDerivation {
-  pname = "omedit";
-  omdir = "OMEdit";
-  omdeps = [
-    omcompiler
-    omplot
-    omparser
-    omsimulator
-  ];
-  omautoconf = true;
-
-  nativeBuildInputs = [
-    jre8
-    qmake
-    qtbase
-    qttools
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    qtwebkit
-    openscenegraph
-    qtxmlpatterns
-    binutils
-  ];
-
-  postPatch = ''
-    sed -i ''$(find -name qmake.m4) -e '/^\s*LRELEASE=/ s|LRELEASE=.*$|LRELEASE=${lib.getDev qttools}/bin/lrelease|'
-  '';
-
-  dontUseQmakeConfigure = true;
-  QMAKESPEC = "linux-clang";
-
-  meta = {
-    description = "Modelica connection editor for OpenModelica";
-    homepage = "https://openmodelica.org";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [
-      balodja
-    ];
-    platforms = lib.platforms.linux;
-  };
-}
@@ -1,44 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchgit,
-  bash,
-  openmodelica,
-  mkOpenModelicaDerivation,
-}:
-let
-  fakegit = import ./fakegit.nix {
-    inherit
-      lib
-      stdenv
-      fetchgit
-      bash
-      ;
-  };
-in
-mkOpenModelicaDerivation {
-  pname = "omlibrary";
-  omdir = "libraries";
-  omtarget = "omlibrary-all";
-  omdeps = [ openmodelica.omcompiler ];
-
-  postPatch = ''
-    patchShebangs --build libraries
-    cp -fv ${fakegit}/bin/checkout-git.sh libraries/checkout-git.sh
-
-    # The EMOTH library is broken in OpenModelica 1.17.0
-    # Let's remove it from targets.
-    sed -i -e '/^OTHER_LIBS=/ s/EMOTH //' libraries/Makefile.libs
-  '';
-
-  meta = {
-    description = "Collection of Modelica libraries to use with OpenModelica,
-including Modelica Standard Library";
-    homepage = "https://openmodelica.org";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [
-      balodja
-    ];
-    platforms = lib.platforms.linux;
-  };
-}
@@ -1,55 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchgit,
-  bash,
-}:
-let
-  mkscript = path: text: ''
-    mkdir -pv `dirname ${path}`
-    cat > ${path} <<"EOF"
-    #!${bash}/bin/bash
-    ME=$(basename ${path})
-    ${text}
-    EOF
-    sed -i "s@%out@$out@g" ${path}
-    chmod +x ${path}
-  '';
-
-  hashname =
-    r:
-    let
-      rpl = lib.replaceStrings [ ":" "/" ] [ "_" "_" ];
-    in
-    (rpl r.url) + "-" + (rpl r.rev);
-
-in
-stdenv.mkDerivation {
-  name = "fakegit";
-
-  buildCommand = ''
-    mkdir -pv $out/repos
-    ${lib.concatMapStrings (r: "cp -r ${fetchgit r} $out/repos/${hashname r}\n") (
-      import ./src-libs.nix
-    )}
-
-    ${mkscript "$out/bin/checkout-git.sh" ''
-      if test "$#" -ne 4; then
-        echo "Usage: $0 DESTINATION URL GITBRANCH HASH"
-        exit 1
-      fi
-      DEST=$1
-      URL=`echo $2 | tr :/ __`
-      GITBRANCH=$3
-      REVISION=$4
-
-      REVISION=`echo $REVISION | tr :/ __`
-
-      rm -rf $DEST
-      mkdir -pv $DEST
-      echo "FAKEGIT cp -r %out/repos/$URL-$REVISION $DEST" >&2
-      cp -r %out/repos/$URL-$REVISION/* $DEST
-      chmod u+w -R $DEST
-    ''}
-  '';
-}
@@ -1,476 +0,0 @@
-[
-  {
-    url = "https://github.com/modelica-3rdparty/AdvancedNoise.git";
-    rev = "5ce57acd279dadd0d25b76a6b02d3f9e9d061246";
-    sha256 = "07jjbj0y6bak269md3xniqb5lgc33m92ar5qixqxj5yxdjaahfs2";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/RWTH-EBC/AixLib.git";
-    rev = "65e49ddf5c935846888a61aa303e52c909619079";
-    sha256 = "18xn8j3x3j4x9bpjgqnq0b6p3yzzsg5n62fv1ldqbbjcmi0vimd5";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/RWTH-EBC/AixLib.git";
-    rev = "v0.4.0";
-    sha256 = "0dw34mjq29n55xh51g1c9a9d0d8gbpn16gj309dfxn4v2hbnfvzx";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/AlgebraTestSuite.git";
-    rev = "b937e1a7f447138c59abec9b2092f84f16bf02e8";
-    sha256 = "0406inasx61dk7vcnziiyhxkna7g61a5hn0znnbxj817hz6q11zn";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/ApproxSpline.git";
-    rev = "28420f5c1a88c9cd069defbd8c05e4a78a090675";
-    sha256 = "07gpyi2brj5zpvrlsnflqjnhbrgxvpqbdshp8lp4lh9mnj5jv95d";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/OpenModelica/BioChem.git";
-    rev = "v1.0.2";
-    sha256 = "037bvj2lqrslg8k5r0rjgdzccslj9bj25b55k4g440vabm5p05qm";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/BondGraph.git";
-    rev = "20c23e60d12989bd4668ccac47659d82d39d29cc";
-    sha256 = "0yrkk708v4bvf423xb4zgpmnaj8qhq5primdg758ayddgli23wa9";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/BrineProp.git";
-    rev = "834fb3519ca8f89efe268582d39d00a7c3991150";
-    sha256 = "1iwqh4kr36wgxc0gci63gdgbqln2sap1w4bkydk1vkss2s302lg4";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/EDF-TREE/BuildSysPro.git";
-    rev = "v3.3.0";
-    sha256 = "1cvcany3q9p1xndarxa2d8mmqxdnqk22476q8l61nayz5qy25x61";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/BuildingControlLib.git";
-    rev = "v1.0.0";
-    sha256 = "0ckdxway0m755mbrl94k4458sijzgknlzsrf7xs5bjymxchm8r2m";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/BuildingSystems.git";
-    rev = "c3070d48015ee75c1577f349cb388a498bef7270";
-    sha256 = "0r876wm6f1xx4cli1lqlylpl3zgaddmy06hcafbnzry9j38vbz4y";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/lbl-srg/modelica-buildings.git";
-    rev = "v6.0.0";
-    sha256 = "0rnnk1clji0myzr7adggki6knbl6v8381vwnqgiz8mkxbmzdwm4f";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/lbl-srg/modelica-buildings.git";
-    rev = "v7.0.0";
-    sha256 = "04n04pp4zvyg8n8h7h79c3wyk7lmn940mh7qzs0lv76g1ybypnlz";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/Chemical.git";
-    rev = "5645573fced862430b7b598b4d7ec1a39c7aa0fa";
-    sha256 = "1kh7kpmjfz55pb8553srlnrh8l00nw21xf5mjzh7nx9b1rndnmyg";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/DeployStructLib.git";
-    rev = "v1.0";
-    sha256 = "1k4zw9lnd0javw4zigxc15l58yf7xdz36b7808g65qxy89w6ksr2";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/DisHeatLib.git";
-    rev = "b11f53379c122870a52f2da9b1705d2c911cd21d";
-    sha256 = "1vm96a4z0b40r0nisxrrzyvan4yphjdkx4ad655phva2636xb5rr";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/AHaumer/DriveControl.git";
-    rev = "b7233fd97a92867bb4ec2c3647c7f7e888398644";
-    sha256 = "0nyp1n8wrkjzfypsmjjzac0g9p4wbc1cxxr040fj20bqdg9l3h1b";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/christiankral/ElectroMechanicalDrives.git";
-    rev = "v2.2.0";
-    sha256 = "0012phmn1y9fgpph45lwbjk0yhm5czidf2z6khm8lddvk93wf31b";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/ExternData.git";
-    rev = "v2.5.0";
-    sha256 = "19dsyq1mk5vl54fqaffzqafm5w94l011cy7pg16c7i933dbqnkki";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica/ExternalMedia.git";
-    rev = "6138312c96142ff3c01190147e6277991bfa2fca";
-    sha256 = "1d9g2hbdvgz13j7kdi1kglkkllj9f00x3dwdp5piyypvs464jsn5";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/ExternalMemoryLib.git";
-    rev = "6488d5815bda23c665123baa916789e283e16d2c";
-    sha256 = "06y1i5w690b3b9x23nzls8y67fl7yd7bn4xl5j0dmyi4qx33aqda";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/FMITest.git";
-    rev = "a67a276083f4010b249802ad8fc70dc30c09adfd";
-    sha256 = "0mg8jlvlwql2nsjiy7c3rdibv73bkfk149ac0450d5pc0hfn9mln";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/FailureModes.git";
-    rev = "v1.2.1";
-    sha256 = "1z8bwrld1rkydgssab5gnrd76frrbky8qxi1lvlaf2jidj6bzn1l";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/FaultTriggering.git";
-    rev = "v0.6.6";
-    sha256 = "0a08yyrbg4a49s0bgqgyds6pidx9xr47yspvl9bdak1mq34qibip";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/FeedDriveLibrary.git";
-    rev = "1.0.1";
-    sha256 = "15fi9dj6zgl0fr90cwxqjbpphj0dwrrmk74hf25j6zd85w2ycqdz";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/DLR-SR/FractionalOrder.git";
-    rev = "99918820e346c362c3ad52d782c8215e5deeac4c";
-    sha256 = "1pycss6fqh86frfdbdfffjhaz09fz1558f9azgckhf8drx6ry1qs";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/Greenhouses-Library.git";
-    rev = "89ae0e8097eb0751abce2013d304fa5f9c09b885";
-    sha256 = "1q77xj6aysqsn3d7kjmcq7dihbw18iqm35ifzdi75xgf3cgwla4f";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/christiankral/HanserModelica.git";
-    rev = "v1.1.0";
-    sha256 = "0zwkrhg2y42m18p4z51izrickiv1vikgz0z7fpjia4dbppckav8i";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/HelmholtzMedia.git";
-    rev = "3b4a4bca94d388744b2d045344ea2f9b0b4d405b";
-    sha256 = "17fzpan89075vb5vbhw5ylgxcdsmj2vjnmmka7cgzh06izb69nvh";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/ibpsa/modelica-ibpsa.git";
-    rev = "v3.0.0";
-    sha256 = "0xwgfndlw76zfmiiqadl85l9na9igsqlmfcawx526sdw2lhhgics";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/open-ideas/IDEAS.git";
-    rev = "v2.1.0";
-    sha256 = "0xp0zg6ib5536d5vl361lsn5w5faqdf6djhcmfxns629wjima8rn";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/IndustrialControlSystems.git";
-    rev = "v1.1.0";
-    sha256 = "1nvgx94iy1pws0768anrl7ssjlzslb5mbp21j7xvf6wpqfmj0npc";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/christiankral/KeyWordIO.git";
-    rev = "v0.9.0";
-    sha256 = "10kvj6zn2r6m3403ja8nkkxbfcchkz0pfk3g70ibr76zivxb5nim";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/FishSim/LibRAS.git";
-    rev = "fca9de50a484a2213f3ca1b39e275c237c471688";
-    sha256 = "0w1c87sifq8klq0f2l70qxjrlvahyxy1cx9rln80rni4d427yc1k";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/LinearMPC.git";
-    rev = "v1.0";
-    sha256 = "1crj60i5f33l9pgip0xbv6ankcga7px0644cj7c2wnzn1fjmn2k8";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/looms-polimi/MEV.git";
-    rev = "v1.0.1";
-    sha256 = "1a7ih9lc01wzaq8a8aznggpi4aqnczyzq49q5hc4fqvmfwl7l0j3";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/ModPowerSystems.git";
-    rev = "df3afce27d5e935c4111f392275744a655abe216";
-    sha256 = "1b1fikm92lv6gj82imka3hxbjwv04i4h33y69yhcxdpqa6z6hm4z";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/OpenModelica/OpenModelica-ModelicaStandardLibrary.git";
-    rev = "4a91d52248b0f17415bba1d58881fc730bd94215";
-    sha256 = "19caxz6hvlrsls3b2387a24zwwnykbb138jpb42gwpy8jlh93yzi";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/OpenModelica/OpenModelica-ModelicaStandardLibrary.git";
-    rev = "cab27240a4a3ed4ea137226f056bbc0d79543f7a";
-    sha256 = "06y911i2hs7hg4ykhb8wngvxhwnaww8rsakwa7ssd047a7glzsb0";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/Modelica-Arduino.git";
-    rev = "v0.1.0";
-    sha256 = "1n34dksqhrn1synv2mp2ifk4dxyhp15f5v1jb1b3dbw9n19951qb";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/Modelica-GNU_ScientificLibrary.git";
-    rev = "9235ab28bdd7f0fe3e7abba48af53d73332858ec";
-    sha256 = "168g9gg12lfa863ifs41bnx6yd0yyjnal6986dgpm51dj5arw6id";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/Modelica-MVEM.git";
-    rev = "v1.0.1";
-    sha256 = "1p68691dnl06lgwm4bl9g036brn4vl7m5x3gq4rxc291339frixk";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/ModelicaADS.git";
-    rev = "v1.0.1";
-    sha256 = "0fhxrl07d7v3wa79d30psm1gxydc0p7s2akfirdx6dai0633skp9";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/xogeny/ModelicaBook.git";
-    rev = "v0.6.0";
-    sha256 = "0yqbll6p738yvpi1x11cjngpz2glda07mljrkjlm23p7l53x63dc";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-compliance/compliance.git";
-    rev = "8a91e75d8a26acc4de30fc0e5d5e9db83c970bd6";
-    sha256 = "1cym1wlgsvfrryq8zqzzrgs4wam1l7pc20q07hk3d615nhq21lg6";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/ModelicaDFR.git";
-    rev = "37a441934d05330cf3d13e9ec551954d27eca84c";
-    sha256 = "13rpcs8cl9x15vi655150zmhmg1iaxpzvxrl3rqif46zpl5dhlj2";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica/Modelica_DeviceDrivers.git";
-    rev = "v1.8.2";
-    sha256 = "16c0p9zn0qrraz59ivinibmikdd251plm1vqngznzhksjwvz6bja";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica/Modelica_LinearSystems2.git";
-    rev = "v2.3.5";
-    sha256 = "0rzicynqgayydxqynnairxk7ybg4alv1xnfz8cgkrpicl2g9bacg";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/Modelica_Requirements.git";
-    rev = "a427b5cb7997e9036c577d219e6b8a5d0c28389a";
-    sha256 = "1ihx46kifnfi9kw1g8nmd9sarl766whbzdk6a44alczsya4gg45k";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica/Modelica_Synchronous.git";
-    rev = "c8350276bfd945086962cf4150ba941b9c57ed13";
-    sha256 = "12ad7fpjy50ky3lvl65r9d5xvlzvw5yqdnbp4rsgl3qw7s3wrmja";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/jwindahlModelon/MultiPhaseMixtureMedia.git";
-    rev = "0bda0c58af6384f8e0edf7aa7520afb369af3e38";
-    sha256 = "11bqm69504bh4h05dxlwdmjfxwls06mr49cz47kl8jmrygkfi4i2";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/OpenIPSL/OpenIPSL.git";
-    rev = "v1.5.0";
-    sha256 = "09xrcz0rdxdy220ki5zyl7920y0a4lg24p0aibna4ad15vszhhwj";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/Optimisers.git";
-    rev = "e33c69edaad6dad8029167b0ca00533964a6fe37";
-    sha256 = "0hcxsrr2n4fzaxdjvgvqayz38kpfk86cclvg5pzcfmjc5bznb8bs";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/lochel/PNlib.git";
-    rev = "059545d48dd9ceeccfa3b4e47689ec8dd334dcd8";
-    sha256 = "1a0hxkgsi4klw9c8zav1dy2p1c85ald29gx82hfacwv55xl9f127";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/PVSystems.git";
-    rev = "v0.6.2";
-    sha256 = "0vcgvdaqfbn46lpzk0kvsif3d55wf8yzhkbdpf5zv04kv7zw25w9";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/PhotoVoltaics.git";
-    rev = "v1.6.0";
-    sha256 = "0zqx77z217iln3vfxn2v3c2jl0jz5kgcd96ylvimjnwr30mxr09n";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/MarekMatejak/Physiolibrary.git";
-    rev = "v2.3.1";
-    sha256 = "0nxfw63m278gaff18zz29n2s1vk4kwdbv2qvbjmcq86fl1i5b3bg";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/Physiomodel.git";
-    rev = "v1.0.0";
-    sha256 = "1sdhv5qgjqv3zdq57pkkrh04ainwv9n5zqd8mb9a3ybjmwdjf6f9";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/dzimmer/PlanarMechanics.git";
-    rev = "55224a9e76de8aa7f708236bd4d7dee624ecba50";
-    sha256 = "0hf7vi44adss86x5ahk5if7bdjgw773d8mb3d8ianq12g8azycyd";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/PowerGrids/PowerGrids.git";
-    rev = "v1.0.0";
-    sha256 = "06bx8mqvmizhfwg99djdfgh2mblc4wzmg0zq4ilrp586jwfninmz";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica/PowerSystems.git";
-    rev = "v1.0.0";
-    sha256 = "1xwhwich7gi6vl33zl2r78xdjklchgkjcnvww6390j20l1wjznkn";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica/PowerSystems.git";
-    rev = "f0721333f4875143565147a7d043bee1c300873b";
-    sha256 = "0gbvx0gzf3akb0w7yvdxfq2y4ps91cy5b93iwnvnw7652x716813";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/RealTimeCoordinationLibrary.git";
-    rev = "v1.0.2";
-    sha256 = "0ch4la04hm059ii5wzph9gsbvqhnfqrvvpqi57qn27bm10c4la0m";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/casella/ScalableTestSuite.git";
-    rev = "v1.11.5";
-    sha256 = "0bhj1q9b8d29nrbr253zszy1w1yvyizvyr3law1pqjj6mhbqmg4i";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/Servomechanisms.git";
-    rev = "3bf82ba5d3f31b4a0ae05f99ae690037358e153e";
-    sha256 = "1swka7d58wkg5pqv59lqgfi7gv6rg5vra4j6r76pn9czx9ddal8w";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/SolarTherm/SolarTherm.git";
-    rev = "203fb5af3b95c731c7fcbe2833d51fd420e80796";
-    sha256 = "1bh4y4igzd0k59xm8j14p52gnlbwkiwwy6bhhyarpr361yrchn33";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/Soltermica.git";
-    rev = "9f7224bd89335f95dffe1ccdaa094df5a3279fdf";
-    sha256 = "1bif3cnwjas6x7b8ahwkm7dbrqrfdqwwa26zmdc6zrpfncl3kqd0";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/SystemDynamics.git";
-    rev = "2f6bd9382c5aac2aff9148cd9113a418767734b6";
-    sha256 = "0ii2mj6ngwjir3gzyad8wsj86pvd6wzal91nz2y7gzwj1djchb3x";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/thom-marx/ThermalSeparation.git";
-    rev = "ffa0495ba829ecab105be4bfb3b7652625ec9c03";
-    sha256 = "1czm97bcrpp2jv0a0kd31a929wqlrlzdhdxvyy4w499dn20jzv1l";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/casella/ThermoPower.git";
-    rev = "650be2c8cbd5abc3535e92b865e509073afc8aeb";
-    sha256 = "08ijrx8xw43dadz5s3kiwa17ax9faq2wyq9gm0vlz9ddbkj0hcaq";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://openmodelica.org/git/ThermoSysPro.git";
-    rev = "db81ae1b5a6a85f6c6c7693244cafa6087e18ff5";
-    sha256 = "12fsf0xxxc1ja6vmm9ff85f8j5sg1lb7w4g57s2w3fkf4d3a7d0c";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://openmodelica.org/git/ThermoSysPro.git";
-    rev = "5cef9acb4dedf8af6f4638a4448f08a544ebd30b";
-    sha256 = "0ihnz1s4rs42yis9zym9nw29ia2lqz2yx2wblc50p6f221w7q78s";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/lenaRB/VVDRlib.git";
-    rev = "eae4981674642eddffc7f2aa3690320fcaddee0e";
-    sha256 = "0qxxk2xlas5mqyc1h8ndic208qj1sm5mr5y8664kv3py7i8jdqi4";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica/VehicleInterfaces.git";
-    rev = "v1.2.5";
-    sha256 = "044k17cpc88wprrvw03p6crm6dy6x9a6xj5104d5nln71lqz5sdq";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/WasteWater.git";
-    rev = "v2.1.0";
-    sha256 = "1dxr4m9j7b5266daj4klbrhvnkqr73sximdw9bk9v5qf0s28li99";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/WindPowerPlants.git";
-    rev = "v1.2.0";
-    sha256 = "1lyrqwsb6sm1wc7vlj72zk5cpjhhzh27fviiqayddqy2b903xish";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/ipsl.git";
-    rev = "v1.1.1";
-    sha256 = "1w2iah8c5d8n01wmxydjk0rrcxh88g8yjy2zmv403azcccq7byzp";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/netCDF-DataReader.git";
-    rev = "v2.5.0";
-    sha256 = "1pd5xf5bgz010lryv8bj6lvlfqn9p184csiffwj8icx7rycnlcqb";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/joewa/open-bldc-modelica.git";
-    rev = "58a83b5b36f267613de4676c95163489b1ddc2e7";
-    sha256 = "0wf6dn64d2psv9b3xg5227vzpk109r3dqzi4m2wwhrilaxs3v004";
-    fetchSubmodules = true;
-  }
-]
@@ -1,39 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p bash
-
-CWD=$PWD
-
-chko() {
-  (
-    T=`mktemp -d`
-    trap "rm -rf $T" EXIT INT PIPE
-    cd $T
-    cat >check.nix <<EOF
-with import <nixpkgs> {};
-fetchgit `cat $CWD/../mkderivation/src-main.nix`
-EOF
-    nix-build check.nix
-    cat result/libraries/Makefile.libs
-  )
-}
-
-getsha256() {
-  URL=$(echo "$1" | sed 's/^"\(.*\)"$/\1/')
-  REV=$(echo "$2" | sed 's/^"\(.*\)"$/\1/')
-  SHA=$(nix run nixpkgs.nix-prefetch-git -c nix-prefetch-git --fetch-submodules "$URL" "$REV" 2>/dev/null | sed -n 's/.*"sha256": "\(.*\)",/\1/g p')
-  echo "{ url = $1; rev = $2; sha256 = \"$SHA\"; fetchSubmodules = true; }"
-}
-
-OUT=src-libs.nix
-
-echo '[' > $OUT
-
-chko |
-grep checkout-git.sh |
-tr \' \" |
-while read NM TGT URL BR REV ; do
-  echo Trying $TGT $URL $REV >&2
-  getsha256 $URL $REV >> $OUT || exit 1
-done
-
-echo ']' >> $OUT
@@ -1,22 +0,0 @@
--- a/Makefile.in
-+++ b/Makefile.in
-@@ -23,7 +23,7 @@
- omedit-testsuite: omedit-testsuite.skip
- omedit-testsuite.skip: omedit.skip testsuite-depends
- 	$(MAKE) -f $(defaultMakefileTarget) -C OMEdit/Testsuite
-omparser: omparser.skip
-+omparser: build-dirs omparser.skip
- omparser.skip:
- 	test -f $@ || $(MAKE) -C OMParser OMBUILDDIR=@OMBUILDDIR@ "host_short=@host_short@" CC="@CC@" CXX="@CXX@" CFLAGS="@CFLAGS@" CPPFLAGS="@CPPFLAGS@" CXXFLAGS="@CXXFLAGS@"
- omsimulator: omsimulator.skip
-@@ -134,6 +134,10 @@
- INSTALL_JAVADIR    = ${DESTDIR}${datadir}/omc/java
- INSTALL_LOCALEDIR  = ${DESTDIR}${datadir}/locale
- 
-+build-dirs:
-+	mkdir -p "@OMBUILDDIR@"/lib/@host_short@/omc
-+	mkdir -p "@OMBUILDDIR@"/include/omc
-+
- install-dirs:
- 	@test ! "${DESTDIR}/@prefix@" -ef "@OMBUILDDIR@" || (echo Error: Install and build dirs are the same && false)
- 	if [ "@APP@" = ".app" ]; then mkdir -p ${INSTALL_APPDIR}; fi
@@ -1,34 +0,0 @@
-{
-  lib,
-  pkg-config,
-  jre8,
-  libuuid,
-  openmodelica,
-  mkOpenModelicaDerivation,
-}:
-
-mkOpenModelicaDerivation {
-  pname = "omparser";
-  omdir = "OMParser";
-  omdeps = [ openmodelica.omcompiler ];
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = [
-    jre8
-    libuuid
-  ];
-
-  patches = [ ./Makefile.in.patch ];
-
-  meta = {
-    description = "Antlr4-based parser of Modelica files from OpenModelica
-suite";
-    homepage = "https://openmodelica.org";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [
-      balodja
-    ];
-    platforms = lib.platforms.linux;
-  };
-}
@@ -1,42 +0,0 @@
-{
-  lib,
-  qtbase,
-  qttools,
-  qmake,
-  wrapQtAppsHook,
-  openmodelica,
-  mkOpenModelicaDerivation,
-}:
-
-mkOpenModelicaDerivation {
-  pname = "omplot";
-  omdir = "OMPlot";
-  omdeps = [ openmodelica.omcompiler ];
-  omautoconf = true;
-
-  nativeBuildInputs = [
-    qtbase
-    qttools
-    qmake
-    wrapQtAppsHook
-  ];
-
-  postPatch = ''
-    sed -i OMPlot/Makefile.in -e 's|bindir = @includedir@|includedir = @includedir@|'
-    sed -i OMPlot/OMPlot/OMPlotGUI/*.pro -e '/INCLUDEPATH +=/s|$| ../../qwt/src|'
-    sed -i ''$(find -name qmake.m4) -e '/^\s*LRELEASE=/ s|LRELEASE=.*$|LRELEASE=${lib.getDev qttools}/bin/lrelease|'
-  '';
-
-  dontUseQmakeConfigure = true;
-  QMAKESPEC = "linux-clang";
-
-  meta = {
-    description = "Plotting tool for OpenModelica-generated results files";
-    homepage = "https://openmodelica.org";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [
-      balodja
-    ];
-    platforms = lib.platforms.linux;
-  };
-}
@@ -1,57 +0,0 @@
-{
-  lib,
-  qttools,
-  qmake,
-  qtwebkit,
-  wrapQtAppsHook,
-  readline,
-  openmodelica,
-  mkOpenModelicaDerivation,
-}:
-
-mkOpenModelicaDerivation {
-  pname = "omshell";
-  omdir = "OMShell";
-  omdeps = [ openmodelica.omcompiler ];
-  omautoconf = true;
-
-  nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    readline
-    qtwebkit
-  ];
-
-  postPatch = with openmodelica; ''
-    sed -i ''$(find -name qmake.m4) -e '/^\s*LRELEASE=/ s|LRELEASE=.*$|LRELEASE=${lib.getDev qttools}/bin/lrelease|'
-    sed -i OMShell/OMShell/OMShellGUI/*.pro -e '
-      s|\$\$\[QT_INSTALL_BINS\]/lrelease|${lib.getDev qttools}/bin/lrelease|
-      /^\s*OMCLIBS =/ s|\$\$(OMBUILDDIR)|${omcompiler}|
-      /^\s*OMCINC =/ s|\$\$(OMBUILDDIR)|${omcompiler}|
-    '
-    sed -i OMShell/OMShell/OMShellGUI/OMShell.config.in -e '
-      s|@OMBUILDDIR@|${omcompiler}|
-      s|@OPENMODELICAHOME@|${omcompiler}|
-    '
-    sed -i OMShell/mosh/src/Makefile.in -e '
-      /^CFLAGS =/ s|-I../../../build|-I${omcompiler}|
-      /^LIBS =/ s|-L@OMBUILDDIR@|-L${omcompiler}|
-      '
-  '';
-
-  dontUseQmakeConfigure = true;
-  QMAKESPEC = "linux-clang";
-
-  meta = {
-    description = "Interactive OpenModelica session shell";
-    homepage = "https://openmodelica.org";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [
-      balodja
-    ];
-    platforms = lib.platforms.linux;
-  };
-}
@@ -1,47 +0,0 @@
-{
-  lib,
-  pkg-config,
-  boost,
-  readline,
-  libxml2,
-  openmodelica,
-  mkOpenModelicaDerivation,
-  fetchpatch,
-}:
-
-mkOpenModelicaDerivation {
-  pname = "omsimulator";
-  omdir = "OMSimulator";
-  omdeps = [ openmodelica.omcompiler ];
-
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/OpenModelica/OMSimulator/commit/5ef06e251d639a0224adc205cdbfa1f99bf9a956.patch";
-      stripLen = 1;
-      extraPrefix = "OMSimulator/";
-      hash = "sha256-hLsS6TNEjddm2o2Optnf8n6hh14up9bWJBoztNmisH0=";
-    })
-  ];
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = [
-    readline
-    libxml2
-    boost
-  ];
-
-  env.CFLAGS = toString [
-    "-Wno-error=implicit-function-declaration"
-  ];
-
-  meta = {
-    description = "OpenModelica FMI & SSP-based co-simulation environment";
-    homepage = "https://openmodelica.org";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [
-      balodja
-    ];
-    platforms = lib.platforms.linux;
-  };
-}
@@ -1,73 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  qmake,
-  wrapQtAppsHook,
-  qtbase,
-  qtscript,
-  qtwebkit,
-  qtserialport,
-  qtsvg,
-  qtdeclarative,
-  qtquickcontrols2,
-  alsa-lib,
-  libsndfile,
-  flite,
-  openssl,
-  udev,
-  SDL2,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "apmplanner2";
-  version = "2.0.28";
-
-  src = fetchFromGitHub {
-    owner = "ArduPilot";
-    repo = "apm_planner";
-    rev = version;
-    sha256 = "0wvbfjnnf7sh6fpgw8gimh5hgzywj3nwrgr80r782f5gayd3v2l1";
-  };
-
-  nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    alsa-lib
-    libsndfile
-    flite
-    openssl
-    udev
-    SDL2
-    qtbase
-    qtscript
-    qtwebkit
-    qtserialport
-    qtsvg
-    qtdeclarative
-    qtquickcontrols2
-  ];
-
-  qmakeFlags = [ "apm_planner.pro" ];
-
-  # this ugly hack is necessary, as `bin/apmplanner2` needs the contents of `share/APMPlanner2` inside of `bin/`
-  preFixup = ''
-    ln --relative --symbolic $out/share/APMPlanner2/* $out/bin/
-    substituteInPlace $out/share/applications/apmplanner2.desktop \
-      --replace /usr $out
-  '';
-
-  meta = {
-    description = "Ground station software for autonomous vehicles";
-    longDescription = ''
-      A GUI ground control station for autonomous vehicles using the MAVLink protocol.
-      Includes support for the APM and PX4 based controllers.
-    '';
-    homepage = "https://ardupilot.org/planner2/";
-    license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ wucke13 ];
-  };
-}
@@ -4,7 +4,6 @@
  fetchFromGitHub,
  which,
  qtbase,
-  qtwebkit,
  qtscript,
  libpulseaudio,
  fftwSinglePrec,
@@ -39,7 +38,6 @@
  soundtouch,
  libzip,
  libhdhomerun,
-  withWebKit ? false,
 }:

 stdenv.mkDerivation rec {
@@ -89,8 +87,7 @@ stdenv.mkDerivation rec {
    soundtouch
    libzip
    libhdhomerun
-  ]
-  ++ lib.optional withWebKit qtwebkit;
+  ];
  nativeBuildInputs = [
    pkg-config
    which
@@ -1,42 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  qmake,
-  wrapQtAppsHook,
-  qtscript,
-  qtwebkit,
-}:
-
-stdenv.mkDerivation rec {
-  version = "21.10.0";
-  pname = "smtube";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/smtube/SMTube/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-ZQIUAi/YC+zsYHVhlprZ5K6NGvT6LojmdQ1Z+WCg1lU=";
-  };
-
-  makeFlags = [
-    "PREFIX=$(out)"
-  ];
-
-  dontUseQmakeConfigure = true;
-
-  nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
-  ];
-  buildInputs = [
-    qtscript
-    qtwebkit
-  ];
-
-  meta = {
-    description = "Play and download Youtube videos";
-    homepage = "http://smplayer.sourceforge.net/smtube.php";
-    license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ vbgl ];
-    platforms = lib.platforms.linux;
-  };
-}
@@ -1,36 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  libsForQt5,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "fontmatrix";
-  version = "0.9.100";
-
-  src = fetchFromGitHub {
-    owner = "fontmatrix";
-    repo = "fontmatrix";
-    rev = "v${version}";
-    sha256 = "sha256-DtajGhx79DiecglXHja9q/TKVq8Jl2faQdA5Ib/yT88=";
-  };
-
-  buildInputs = [
-    libsForQt5.qttools
-    libsForQt5.qtwebkit
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  meta = {
-    description = "Free/libre font explorer for Linux, Windows and Mac";
-    homepage = "https://github.com/fontmatrix/fontmatrix";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux;
-  };
-}
@@ -189,40 +189,6 @@ let
        hash = "sha256-B/z/+tai01RU/bAJSCp5a0/dGI8g36nwso8MiJv27YM=";
      })
    ];
-    qtwebkit = [
-      (fetchpatch {
-        name = "qtwebkit-python39-json.patch";
-        url = "https://github.com/qtwebkit/qtwebkit/commit/78360c01c796b6260bf828bc9c8a0ef73c5132fd.patch";
-        sha256 = "yCX/UL666BPxjnxT6rIsUrJsPcSWHhZwMFJfuHhbkhk=";
-      })
-      (fetchpatch {
-        name = "qtwebkit-bison-3.7-build.patch";
-        url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch";
-        sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";
-      })
-      (fetchpatch {
-        name = "qtwebkit-glib-2.68.patch";
-        url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch";
-        sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0";
-      })
-      (fetchpatch {
-        name = "qtwebkit-darwin-handle.patch";
-        url = "https://github.com/qtwebkit/qtwebkit/commit/5c272a21e621a66862821d3ae680f27edcc64c19.patch";
-        sha256 = "9hjqLyABz372QDgoq7nXXXQ/3OXBGcYN1/92ekcC3WE=";
-      })
-      (fetchpatch {
-        name = "qtwebkit-libxml2-api-change.patch";
-        url = "https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch";
-        sha256 = "WZEj+UuKhgJBM7auhND3uddk1wWdTY728jtiWVe7CSI=";
-      })
-      ./qtwebkit.patch
-      ./qtwebkit-icu68.patch
-      ./qtwebkit-cstdint.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      ./qtwebkit-darwin-no-readline.patch
-      ./qtwebkit-darwin-no-qos-classes.patch
-    ];
    qttools = [ ./qttools.patch ];
  };

@@ -304,7 +270,6 @@ let
      qtwayland = callPackage ../modules/qtwayland.nix { };
      qtwebchannel = callPackage ../modules/qtwebchannel.nix { };
      qtwebglplugin = callPackage ../modules/qtwebglplugin.nix { };
-      qtwebkit = callPackage ../modules/qtwebkit.nix { };
      qtwebsockets = callPackage ../modules/qtwebsockets.nix { };
      qtx11extras = callPackage ../modules/qtx11extras.nix { };
      qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix { };
@@ -1,11 +0,0 @@
-diff -up qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h.me qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h
--- qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h.me	2023-02-20 15:40:04.045911245 +0100
-+++ qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h	2023-02-20 15:40:39.038549787 +0100
-@@ -16,6 +16,7 @@
- #include <algorithm>
- #include <string.h>
- #include <stdlib.h>
-+#include <cstdint>
- 
- namespace gl
- {
@@ -1,11 +0,0 @@
-diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake
--- a/Source/cmake/OptionsQt.cmake
-+++ b/Source/cmake/OptionsQt.cmake
-@@ -683,7 +683,6 @@ if (WIN32 AND COMPILER_IS_GCC_OR_CLANG)
- endif ()
- 
- if (APPLE)
-    SET_AND_EXPOSE_TO_BUILD(HAVE_QOS_CLASSES 1)
- endif ()
- 
- if (ENABLE_MATHML)
@@ -1,30 +0,0 @@
-diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
--- a/Source/JavaScriptCore/shell/CMakeLists.txt
-+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
-@@ -9,7 +9,6 @@ set(JSC_LIBRARIES
- )
- 
- if (WTF_OS_MAC_OS_X)
-    list(APPEND JSC_LIBRARIES edit)
- endif ()
- 
- if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC")
-diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
--- a/Source/WTF/wtf/Platform.h
-+++ b/Source/WTF/wtf/Platform.h
-@@ -563,7 +563,6 @@
- #if PLATFORM(IOS)
- 
- #define HAVE_NETWORK_EXTENSION 1
-#define HAVE_READLINE 1
- #if USE(APPLE_INTERNAL_SDK)
- #define USE_CFNETWORK 1
- #endif
-@@ -650,7 +649,6 @@
- #define HAVE_MADV_DONTNEED 1
- #define HAVE_MERGESORT 1
- #define HAVE_PTHREAD_SETNAME_NP 1
-#define HAVE_READLINE 1
- #define HAVE_SYS_TIMEB_H 1
- 
- #if !PLATFORM(GTK) && !PLATFORM(QT)
@@ -1,170 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
-Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
-        ucnv_setFallback(m_converterICU, TRUE);
-                                         ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
-In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
-Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-
--- a/Source/WebCore/platform/text/TextCodecICU.cpp
-+++ b/Source/WebCore/platform/text/TextCodecICU.cpp
-@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
-     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
-     ASSERT(U_SUCCESS(err));
-     if (m_converterICU)
-        ucnv_setFallback(m_converterICU, TRUE);
-+        ucnv_setFallback(m_converterICU, true);
- }
- 
- int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
--- a/Source/WebCore/platform/text/icu/UTextProvider.h
-+++ b/Source/WebCore/platform/text/icu/UTextProvider.h
-@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
-            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
-             text->chunkOffset = text->chunkLength;
-            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     } else {
-@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
-            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex <= 0 && !text->chunkNativeStart) {
-             text->chunkOffset = 0;
-            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     }
--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
-+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
-@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
-         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
-            return TRUE;
-+            return true;
-         }
-         if (index >= length && uText->chunkNativeLimit == length) {
-             // Off the end of the buffer, but we can't get it.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
-            return FALSE;
-+            return false;
-         }
-     } else {
-         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
-            return TRUE;
-+            return true;
-         }
-         if (!index && !uText->chunkNativeStart) {
-             // Already at the beginning; can't go any farther.
-             uText->chunkOffset = 0;
-            return FALSE;
-+            return false;
-         }
-     }
-     
-@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
- 
-     uText->nativeIndexingLimit = uText->chunkLength;
- 
-    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
-@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
- static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
-        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
-    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
-+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
-@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
- static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
-        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
-    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
@@ -1,12 +0,0 @@
-diff --git a/Source/WebKit2/PlatformQt.cmake b/Source/WebKit2/PlatformQt.cmake
--- a/Source/WebKit2/PlatformQt.cmake
-+++ b/Source/WebKit2/PlatformQt.cmake
-@@ -261,6 +261,7 @@
- list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
-     ${GLIB_INCLUDE_DIRS}
-     ${GSTREAMER_INCLUDE_DIRS}
-+    ${GSTREAMER_PBUTILS_INCLUDE_DIRS}
-     ${Qt5Quick_INCLUDE_DIRS}
-     ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
-     ${SQLITE_INCLUDE_DIR}
-
@@ -43,18 +43,6 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
    };
  };

-  # qtwebkit does not have an official release tarball on the qt mirror and is
-  # mostly maintained by the community.
-  qtwebkit = rec {
-    src = fetchFromGitHub {
-      owner = "qt";
-      repo = "qtwebkit";
-      rev = "v${version}";
-      sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg";
-    };
-    version = "5.212.0-alpha4";
-  };
-
  # qtsystems has no official releases
  qtsystems = {
    version = "unstable-2019-01-03";
@@ -1,122 +0,0 @@
-{
-  qtModule,
-  stdenv,
-  lib,
-  fetchurl,
-  qtbase,
-  qtdeclarative,
-  qtlocation,
-  qtmultimedia,
-  qtsensors,
-  qtwebchannel,
-  fontconfig,
-  libwebp,
-  libxml2,
-  libxslt,
-  sqlite,
-  systemd,
-  glib,
-  gst_all_1,
-  cmake,
-  bison,
-  flex,
-  gdb,
-  gperf,
-  perl,
-  pkg-config,
-  python3,
-  ruby,
-}:
-
-let
-  hyphen = stdenv.mkDerivation rec {
-    pname = "hyphen";
-    version = "2.8.8";
-    src = fetchurl {
-      url = "http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-${version}.tar.gz";
-      sha256 = "304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705";
-    };
-    postPatch = ''
-      patchShebangs tests
-    '';
-    buildInputs = [ perl ];
-  };
-in
-qtModule {
-  pname = "qtwebkit";
-  propagatedBuildInputs = [
-    qtbase
-    qtdeclarative
-    qtlocation
-    qtsensors
-    qtwebchannel
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    qtmultimedia
-  ];
-  buildInputs = [
-    fontconfig
-    libwebp
-    libxml2
-    libxslt
-    sqlite
-    glib
-    gst_all_1.gstreamer
-    gst_all_1.gst-plugins-base
-    hyphen
-  ];
-  nativeBuildInputs = [
-    bison
-    flex
-    gdb
-    gperf
-    perl
-    pkg-config
-    python3
-    ruby
-    cmake
-  ];
-
-  cmakeFlags = [
-    "-DPORT=Qt"
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    "-DQt5Multimedia_DIR=${lib.getDev qtmultimedia}/lib/cmake/Qt5Multimedia"
-    "-DQt5MultimediaWidgets_DIR=${lib.getDev qtmultimedia}/lib/cmake/Qt5MultimediaWidgets"
-    "-DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF"
-  ];
-
-  env.NIX_CFLAGS_COMPILE = toString (
-    [
-      # with gcc7 this warning blows the log over Hydra's limit
-      "-Wno-expansion-to-defined"
-    ]
-    # with gcc8, -Wclass-memaccess became part of -Wall and this too exceeds the logging limit
-    ++ lib.optionals stdenv.cc.isGNU [
-      "-Wno-class-memaccess"
-    ]
-    # with clang this warning blows the log over Hydra's limit
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-Wno-inconsistent-missing-override"
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      ''-DNIXPKGS_LIBUDEV="${lib.getLib systemd}/lib/libudev"''
-    ]
-  );
-
-  doCheck = false; # fails 13 out of 13 tests (ctest)
-
-  # remove forbidden references to $TMPDIR
-  preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
-    patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/libexec/*
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = {
-    maintainers = [ ];
-    knownVulnerabilities = [
-      "QtWebkit upstream is unmaintained and receives no security updates, see https://blogs.gnome.org/mcatanzaro/2022/11/04/stop-using-qtwebkit/"
-    ];
-  };
-}
@@ -1,42 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  qmake,
-  qtwebkit,
-  hunspell,
-}:
-
-stdenv.mkDerivation {
-  pname = "qtwebkit-plugins";
-  version = "unstable-2017-01-25";
-
-  src = fetchFromGitHub {
-    owner = "QupZilla";
-    repo = "qtwebkit-plugins";
-    rev = "b58ee9d5b31977491662aa4e8bee16404638bf14";
-    sha256 = "04wvlhdj45g1v1a3zl0pkf9r72i22h1br10lhhrgad7ypym974gw";
-  };
-
-  nativeBuildInputs = [ qmake ];
-
-  buildInputs = [
-    qtwebkit
-    hunspell
-  ];
-
-  dontWrapQtApps = true;
-
-  postPatch = ''
-    sed -i "s,-lhunspell,-lhunspell-${lib.versions.majorMinor hunspell.version}," src/spellcheck/spellcheck.pri
-    sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," src/src.pro
-  '';
-
-  meta = {
-    description = "Spell checking plugin using Hunspell and HTML5 Notifications plugin for QtWebKit";
-    homepage = "https://github.com/QupZilla/qtwebkit-plugins";
-    license = lib.licenses.gpl3;
-    platforms = lib.platforms.linux;
-    maintainers = [ ];
-  };
-}
@@ -17,7 +17,6 @@
  enableVerbose ? true,
  withConnectivity ? false,
  withMultimedia ? false,
-  withWebKit ? false,
  withWebSockets ? false,
  withLocation ? false,
  withSerialPort ? false,
@@ -139,7 +138,6 @@ buildPythonPackage rec {
    ]
    ++ lib.optional withConnectivity qtconnectivity
    ++ lib.optional withMultimedia qtmultimedia
-    ++ lib.optional withWebKit qtwebkit
    ++ lib.optional withWebSockets qtwebsockets
    ++ lib.optional withLocation qtlocation
    ++ lib.optional withSerialPort qtserialport
@@ -156,7 +154,6 @@ buildPythonPackage rec {
      pyqt-builder
    ]
    ++ lib.optional withConnectivity qtconnectivity
-    ++ lib.optional withWebKit qtwebkit
    ++ lib.optional withWebSockets qtwebsockets
    ++ lib.optional withLocation qtlocation
    ++ lib.optional withSerialPort qtserialport
@@ -170,7 +167,6 @@ buildPythonPackage rec {
  passthru = {
    inherit sip pyqt5-sip;
    multimediaEnabled = withMultimedia;
-    webKitEnabled = withWebKit;
    WebSocketsEnabled = withWebSockets;
    connectivityEnabled = withConnectivity;
    locationEnabled = withLocation;
@@ -191,7 +187,6 @@ buildPythonPackage rec {
    "PyQt5.QtGui"
  ]
  ++ lib.optional withWebSockets "PyQt5.QtWebSockets"
-  ++ lib.optional withWebKit "PyQt5.QtWebKit"
  ++ lib.optional withMultimedia "PyQt5.QtMultimedia"
  ++ lib.optional withConnectivity "PyQt5.QtBluetooth"
  ++ lib.optional withLocation "PyQt5.QtPositioning"
@@ -309,6 +309,7 @@ mapAliases {
  apacheAnt = throw "'apacheAnt' has been renamed to/replaced by 'ant'"; # Converted to throw 2025-10-27
  apacheKafka_3_7 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2025-09-27
  apacheKafka_3_8 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2025-09-27
+  apmplanner2 = throw "'apmplanner2' has been removed as it depends on insecure&unmaintained qtwebkit"; # Added 2026-04-26
  apple-sdk_11 = throw "apple-sdk_11 was removed as Nixpkgs no longer supports macOS 11; see the 25.11 release notes"; # Added 2025-05-10
  apple-sdk_12 = throw "apple-sdk_12 was removed as Nixpkgs no longer supports macOS 12; see the 25.11 release notes"; # Added 2025-05-10
  apple-sdk_13 = throw "apple-sdk_13 was removed as Nixpkgs no longer supports macOS 13; see the 25.11 release notes"; # Added 2025-05-10
@@ -434,6 +435,7 @@ mapAliases {
  cataract-unstable = throw "'cataract-unstable' has been removed due to a lack of maintenace"; # Added 2025-08-25
  catch = throw "catch has been removed. Please upgrade to catch2 or catch2_3"; # Added 2025-08-21
  catnip-gtk4 = throw "'catnip-gtk4' has been removed, as it has been unmaintained upstream since June 2023, use cavasik or cavalier instead"; # Added 2026-01-01
+  cb2bib = throw "'cb2bib' has been removed as it depends on insecure&unmaintained qtwebkit"; # Added 2026-04-26
  cdktf-cli = warnAlias "'cdktf-cli' has been renamed to/replaced by 'cdktn-cli'" cdktn-cli; # Added 2026-02-18
  cdparanoiaIII = cdparanoia-iii; # Added 2026-02-08
  cdwe = throw "'cdwe' has been removed, as it has been unmaintained upstream since June 2023"; # Added 2026-01-01
@@ -761,6 +763,7 @@ mapAliases {
  fontibmtype1 = font-ibm-type1; # Added 2026-01-19
  fontisasmisc = font-isas-misc; # Added 2026-01-19
  fontjismisc = font-jis-misc; # Added 2026-01-19
+  fontmatrix = throw "'fontmatrix' has been removed as upstream was archived 2024-10-24"; # Added 2026-04-26
  fontmicromisc = font-micro-misc; # Added 2026-01-19
  fontmisccyrillic = font-misc-cyrillic; # Added 2026-01-19
  fontmiscethiopic = font-misc-ethiopic; # Added 2026-01-19
@@ -887,6 +890,7 @@ mapAliases {
  godot_4-export-templates = throw "'godot_4-export-templates' has been renamed to/replaced by 'godot_4-export-templates-bin'"; # Converted to throw 2025-10-27
  godot_4_3-export-templates = throw "'godot_4_3-export-templates' has been renamed to/replaced by 'godot_4_3-export-templates-bin'"; # Converted to throw 2025-10-27
  godot_4_4-export-templates = throw "'godot_4_4-export-templates' has been renamed to/replaced by 'godot_4_4-export-templates-bin'"; # Converted to throw 2025-10-27
+  goldendict = throw "'goldendict' has been removed as upstream goldendict/goldendict is unmaintained and depends on deprecated qtwebkit; use the actively-developed Qt6 fork 'goldendict-ng' instead"; # Added 2026-04-26
  goldwarden = throw "'goldwarden' has been removed, as it no longer works with new Bitwarden versions and is abandoned upstream"; # Added 2025-09-16
  goocanvas2 = warnAlias "'goocanvas2' has been renamed to goocanvas_2" goocanvas_2; # Added 2026-01-17
  goocanvas3 = warnAlias "'goocanvas3' has been renamed to goocanvas_3" goocanvas_3; # Added 2026-01-17
@@ -1505,6 +1509,7 @@ mapAliases {
    else
      nixfmt;
  nixForLinking = throw "nixForLinking has been removed, use `nixVersions.nixComponents_<version>` instead"; # Added 2025-08-14
+  nixnote2 = throw "'nixnote2' has been removed as upstream has been unmaintained since 2017"; # Added 2026-04-26
  nixos-rebuild = nixos-rebuild-ng; # Added 2025-12-02
  nixosTest = throw "'nixosTest' has been renamed to/replaced by 'testers.nixosTest'"; # Converted to throw 2025-10-27
  nixStable = throw "'nixStable' has been renamed to/replaced by 'nixVersions.stable'"; # Converted to throw 2025-10-27
@@ -1563,6 +1568,7 @@ mapAliases {
  openjdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
  openjfx23 = throw "OpenJFX 23 was removed as it has reached its end of life"; # Added 2025-11-04
  openjfx24 = throw "OpenJFX 24 was removed as it has reached its end of life"; # Added 2025-10-04
+  openmodelica = throw "'openmodelica' has been removed as it was unmaintained in nixpkgs and depends on insecure&unmtaintained qtwebkit"; # Added 2026-04-26
  openmw-tes3mp = throw "'openmw-tes3mp' has been removed due to lack of maintenance upstream"; # Added 2025-08-30
  openssl_3_0 = throw "'openssl_3_0' has been renamed to/replaced by 'openssl_3'"; # Converted to throw 2025-10-27
  opensycl = throw "'opensycl' has been renamed to/replaced by 'adaptivecpp'"; # Converted to throw 2025-10-27
@@ -1764,6 +1770,7 @@ mapAliases {
  qubes-core-vchan-xen = throw "'qubes-core-vchan-xen' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
  quicksynergy = throw "'quicksynergy' has been removed due to lack of maintenance upstream. Consider using 'deskflow' instead."; # Added 2025-06-18
  quictls = throw "'quictls' has been removed. QUIC support is now available in `openssl`.";
+  quiterss = throw "'quiterss' has been removed as upstream has been unmaintained since March 2022"; # Added 2026-04-26
  quorum = throw "'quorum' has been removed as it was broken and unmaintained upstream"; # Added 2025-11-07
  qutebrowser-qt5 = lib.warnOnInstantiate "'qutebrowser-qt5' has been removed as it depended on vulnerable and outdated qt5 webengine" qutebrowser; # Added 2026-01-14
  qv2ray = throw "'qv2ray' has been removed as it was unmaintained"; # Added 2025-06-03
@@ -1869,6 +1876,7 @@ mapAliases {
  slrn = throw "'slrn' has been removed because it is unmaintained upstream and broken."; # Added 2025-06-11
  slurm-llnl = throw "'slurm-llnl' has been renamed to/replaced by 'slurm'"; # Converted to throw 2025-10-27
  smartgithg = throw "'smartgithg' has been renamed to/replaced by 'smartgit'"; # Converted to throw 2025-10-27
+  smtube = throw "'smtube' has been removed as it depends on insecure&unmaintained qtwebkit"; # Added 2026-04-26
  snapcraft = throw "snapcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # Added 2025-09-18
  snort2 = throw "snort2 has been removed as it is deprecated and unmaintained by upstream. Consider using snort (snort3) package instead."; # 2025-05-21
  snowman = throw "snowman has been removed as it is unmaintained by upstream"; # 2025-10-12
@@ -2075,6 +2083,7 @@ mapAliases {
  utilmacros = util-macros; # Added 2025-02-04
  vaapiIntel = throw "'vaapiIntel' has been renamed to/replaced by 'intel-vaapi-driver'"; # Converted to throw 2025-10-27
  vaapiVdpau = throw "'vaapiVdpau' has been renamed to/replaced by 'libva-vdpau-driver'"; # Converted to throw 2025-10-27
+  vacuum = throw "'vacuum' has been removed as upstream Vacuum-IM has been unmaintained since December 2021"; # Added 2026-04-26
  valum = throw "'valum' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
  vamp.vampSDK = throw "'vamp.vampSDK' has been renamed to/replaced by 'vamp-plugin-sdk'"; # Converted to throw 2025-10-27
  vapoursynth-nnedi3 = throw "'vapoursynth-nnedi3' has been removed per upstream. Use vapoursynth-znedi3 instead."; # Added 2026-04-20
@@ -2747,8 +2747,6 @@ with pkgs;
      ;
  };

-  nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { };
-
  nodejs = nodejs_24;
  nodejs-slim = nodejs-slim_24;

@@ -3215,7 +3213,6 @@ with pkgs;
  rtaudio = rtaudio_5;

  mpi = openmpi; # this attribute should used to build MPI applications
-  openmodelica = recurseIntoAttrs (callPackage ../applications/science/misc/openmodelica { });

  qarte = libsForQt5.callPackage ../applications/video/qarte { };

@@ -3455,8 +3452,6 @@ with pkgs;

  usort = with python3Packages; toPythonApplication usort;

-  vacuum = libsForQt5.callPackage ../applications/networking/instant-messengers/vacuum { };
-
  vimpager = callPackage ../tools/misc/vimpager { };
  vimpager-latest = callPackage ../tools/misc/vimpager/latest.nix { };

@@ -9147,8 +9142,6 @@ with pkgs;
    confd-calico
    ;

-  cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { };
-
  cbconvert-gui = cbconvert.gui;

  cdparanoia = cdparanoia-iii;
@@ -9317,8 +9310,6 @@ with pkgs;
  };
  gnuradioPackages = recurseIntoAttrs gnuradio.pkgs;

-  goldendict = libsForQt5.callPackage ../applications/misc/goldendict { };
-
  inherit (ocamlPackages) google-drive-ocamlfuse;

  gqrx-portaudio = gqrx.override {
@@ -9986,8 +9977,6 @@ with pkgs;
    protobuf = protobuf_21;
  };

-  smtube = libsForQt5.callPackage ../applications/video/smtube { };
-
  inherit
    ({
      softmaker-office = callPackage ../applications/office/softmaker/softmaker-office.nix { };
@@ -10170,8 +10159,6 @@ with pkgs;
    tag = "-daemon-qt5";
  };

-  quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss { };
-
  quodlibet = callPackage ../applications/audio/quodlibet {
    kakasi = null;
    keybinder3 = null;
@@ -11701,10 +11688,6 @@ with pkgs;
    }
  );

-  ### SCIENCE/ROBOTICS
-
-  apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { };
-
  ### MISC

  antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { };
@@ -432,9 +432,10 @@ mapAliases {
  pypcap = throw "pypcap has been removed because it is broken and unmaintained upstream."; # added 2025-06-18
  pyqldb = throw "pyqldb has been removed, because the underlying service is reaching end of support"; # added 2025-07-30
  pyqt5-stubs = throw "'pyqt5-stubs' has been removed as it was unused and depended on vulnerable qt5 webengine"; # Added 2026-01-15
+  pyqt5-webkit = throw "'pyqt5-webkit' has been removed as it depended on insecure&unmaintained qtwebkit"; # Added 2026-04-26
  pyqt5_sip = throw "'pyqt5_sip' has been renamed to/replaced by 'pyqt5-sip'"; # Converted to throw 2025-10-29
  pyqt5_with_qtmultimedia = throw "'pyqt5_with_qtmultimedia' has been renamed to/replaced by 'pyqt5-multimedia'"; # Converted to throw 2025-10-29
-  pyqt5_with_qtwebkit = throw "'pyqt5_with_qtwebkit' has been renamed to/replaced by 'pyqt5-webkit'"; # Converted to throw 2025-10-29
+  pyqt5_with_qtwebkit = throw "'pyqt5_with_qtwebkit' has been removed as it depended on insecure&unmaintained qtwebkit"; # Added 2026-04-26
  pyqtwebengine = "'pyqtwebengine' has been removed as it depended on the removed qt5 webengine"; # Added 2026-02-10
  pyramid_beaker = throw "'pyramid_beaker' has been renamed to/replaced by 'pyramid-beaker'"; # Converted to throw 2025-10-29
  pyramid_chameleon = throw "'pyramid_chameleon' has been renamed to/replaced by 'pyramid-chameleon'"; # Converted to throw 2025-10-29
@@ -14746,11 +14746,6 @@ self: super: with self; {
    inherit (pkgs) mesa;
  };

-  # `pyqt5-webkit` should not be used by python libraries in
-  # pkgs/development/python-modules/*. Putting this attribute in
-  # `propagatedBuildInputs` may cause collisions.
-  pyqt5-webkit = self.pyqt5.override { withWebKit = true; };
-
  pyqt6 = callPackage ../development/python-modules/pyqt/6.x.nix {
    inherit (pkgs) mesa;
  };
@@ -219,8 +219,6 @@ makeScopeWithSplicing' {

        telepathy = callPackage ../development/libraries/telepathy/qt { };

-        qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { };
-
        signond = callPackage ../development/libraries/signond { };

        timed = callPackage ../applications/system/timed { };