Merge staging-next into staging

doc/release-notes/rl-2605.section.md

@@ -274,6 +274,8 @@
 
 - The default packages in `services.jenkins.packages` have been dropped, since not every Jenkins installation needs any package at all. It's more reasonable to leave it empty and let users configure what they need.
 
+- The `pie` hardening flag has been removed and will now error, after being deprecated in 25.11. Compilers are expected to enable PIE by default, as has been common practice since 2016 outside of Nixpkgs. If a package needs `pie` disabled pass `-no-pie` in `CFLAGS`. It is unlikely this will be necessary in many cases; due to the prevalence of default PIE toolchains, most packages incompatible with PIE already pass `-no-pie`.
+
 ## Other Notable Changes {#sec-nixpkgs-release-26.05-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

maintainers/maintainer-list.nix

@@ -13245,6 +13245,12 @@
     github = "joshainglis";
     githubId = 1281131;
   };
+  joshgodsiff = {
+    name = "Josh Godsiff";
+    email = "josh.godsiff@gmail.com";
+    github = "joshgodsiff";
+    githubId = 145132;
+  };
   joshheinrichs-shopify = {
     name = "Josh Heinrichs";
     email = "josh.heinrichs@shopify.com";

nixos/doc/manual/release-notes/rl-2605.section.md

@@ -361,6 +361,8 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>.
 
 - Cinnamon has been updated to 6.6, please check the [upstream announcement](https://www.linuxmint.com/rel_zena_whatsnew.php) for more details.
 
+- Rspamd has been updated to 4.0. Please check the upstream [migration](https://docs.rspamd.com/tutorials/migration/#migration-to-rspamd-400) documentation, especially if you run a sharded Redis deployment.
+
 - Budgie has been updated to 10.10, please check the [upstream announcement](https://buddiesofbudgie.org/blog/budgie-10-10-released) for more details.
 
 - `fonts.fontconfig.useEmbeddedBitmaps` is now set to `true` by default.

nixos/modules/services/misc/open-webui.nix

@@ -56,7 +56,7 @@ in
         '';
         description = ''
           Extra environment variables for Open-WebUI.
-          For more details see <https://docs.openwebui.com/getting-started>
+          For more details see <https://docs.openwebui.com/reference/env-configuration>
         '';
       };
 

nixos/modules/services/monitoring/scrutiny.nix

@@ -236,6 +236,44 @@ in
           RuntimeDirectoryMode = "0700";
           StateDirectory = "scrutiny";
           StateDirectoryMode = "0750";
+
+          RemoveIPC = true;
+          RestrictNamespaces = true;
+          RestrictRealtime = true;
+          RestrictSUIDSGID = true;
+          MemoryDenyWriteExecute = true;
+          SystemCallFilter = [
+            "@system-service"
+            "~@privileged"
+            "~@resources"
+          ];
+          SystemCallArchitectures = "native";
+          LockPersonality = true;
+          CapabilityBoundingSet = "";
+          NoNewPrivileges = true;
+          PrivateTmp = true;
+          PrivateMounts = true;
+          PrivateDevices = true;
+          ProtectClock = true;
+          ProtectControlGroups = true;
+          ProtectHome = true;
+          ProtectHostname = true;
+          ProtectKernelLogs = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          ProtectSystem = "strict";
+          ProtectProc = "invisible";
+          ProcSubset = "pid";
+          RestrictAddressFamilies = [
+            "AF_NETLINK"
+            "AF_INET"
+            "AF_INET6"
+            "AF_UNIX"
+          ];
+          SocketBindDeny = "any";
+          SocketBindAllow = [
+            "tcp:${toString cfg.settings.web.listen.port}"
+          ];
         };
       };
     })

nixos/modules/services/web-servers/stargazer.nix

@@ -109,7 +109,7 @@ in
 
     store = lib.mkOption {
       type = lib.types.path;
-      default = /var/lib/gemini/certs;
+      default = "/var/lib/gemini/certs";
       description = ''
         Path to the certificate store on disk. This should be a
         persistent directory writable by Stargazer.
@@ -284,7 +284,7 @@ in
     };
 
     # Create default cert store
-    systemd.tmpfiles.rules = lib.mkIf (cfg.store == /var/lib/gemini/certs) [
+    systemd.tmpfiles.rules = lib.mkIf ((builtins.toString cfg.store) == "/var/lib/gemini/certs") [
       ''d /var/lib/gemini/certs - "${cfg.user}" "${cfg.group}" -''
     ];
 

nixos/tests/lomiri-music-app.nix

@@ -135,7 +135,7 @@ in
 
     # Need to wait abit to make sure our test file gets scanned & added to the database.
     # No good feedback on when this is done... Prolly some time after extractor sub-service is started.
-    machine.wait_for_console_text("Successfully activated service 'com.lomiri.MediaScanner2.Extractor'")
+    machine.wait_for_console_text("Started \S*com.lomiri.MediaScanner2.Extractor")
     machine.sleep(10)
 
     with subtest("lomiri music launches"):

pkgs/applications/gis/qgis/ltr.nix

@@ -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
 

pkgs/applications/gis/qgis/unwrapped-ltr.nix

@@ -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"

pkgs/applications/misc/goldendict/0001-dont-check-for-updates.patch

@@ -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 );

pkgs/applications/misc/goldendict/0001-dont-use-maclibs.patch

@@ -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

pkgs/applications/misc/goldendict/default.nix

@@ -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;
-  };
-}

pkgs/applications/misc/nixnote2/default.nix

@@ -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;
-  };
-}

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -1058,11 +1058,11 @@
     "vendorHash": null
   },
   "ovh_ovh": {
-    "hash": "sha256-OYzMG/F4wnsB10WPwNRcRKjbdT469nLMeFusHQfsdm8=",
+    "hash": "sha256-xjSGnukY76k6xalVMBfXikuI2MyXvROVoA91wB8AXnI=",
     "homepage": "https://registry.terraform.io/providers/ovh/ovh",
     "owner": "ovh",
     "repo": "terraform-provider-ovh",
-    "rev": "v2.13.0",
+    "rev": "v2.13.1",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

pkgs/applications/networking/instant-messengers/vacuum/default.nix

@@ -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";
-  };
-}

pkgs/applications/networking/newsreaders/quiterss/default.nix

@@ -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 = [ ];
-  };
-}

pkgs/applications/office/cb2bib/default.nix

@@ -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;
-  };
-
-}

pkgs/applications/science/misc/openmodelica/combined/default.nix

@@ -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;
-  };
-}

pkgs/applications/science/misc/openmodelica/default.nix

@@ -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 { };
-  }
-)

pkgs/applications/science/misc/openmodelica/mkderivation/default.nix

@@ -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" ];
-  }
-)

pkgs/applications/science/misc/openmodelica/mkderivation/src-main.nix

@@ -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

pkgs/applications/science/misc/openmodelica/omcompiler/default.nix

@@ -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" ];
-  }
-)

pkgs/applications/science/misc/openmodelica/omedit/default.nix

@@ -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;
-  };
-}

pkgs/applications/science/misc/openmodelica/omlibrary/default.nix

@@ -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;
-  };
-}

pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix

@@ -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
-    ''}
-  '';
-}

pkgs/applications/science/misc/openmodelica/omlibrary/src-libs.nix

@@ -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;
-  }
-]

pkgs/applications/science/misc/openmodelica/omlibrary/update-src-libs.sh

@@ -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

pkgs/applications/science/misc/openmodelica/omparser/Makefile.in.patch

@@ -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

pkgs/applications/science/misc/openmodelica/omparser/default.nix

@@ -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;
-  };
-}

pkgs/applications/science/misc/openmodelica/omplot/default.nix

@@ -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;
-  };
-}

pkgs/applications/science/misc/openmodelica/omshell/default.nix

@@ -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;
-  };
-}

pkgs/applications/science/misc/openmodelica/omsimulator/default.nix

@@ -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;
-  };
-}

pkgs/applications/science/robotics/apmplanner2/default.nix

@@ -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 ];
-  };
-}

pkgs/applications/video/mythtv/default.nix

@@ -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

pkgs/applications/video/smtube/default.nix

@@ -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;
-  };
-}

pkgs/build-support/node/fetch-pnpm-deps/default.nix

@@ -162,9 +162,9 @@ in
               # See https://github.com/NixOS/nixpkgs/pull/350063
               # See https://github.com/NixOS/nixpkgs/issues/422889
               if [[ ${toString fetcherVersion} -ge 2 ]]; then
-                find $storePath -type f -name "*-exec" -print0 | xargs -0 chmod 555
-                find $storePath -type f -not -name "*-exec" -print0 | xargs -0 chmod 444
-                find $storePath -type d -print0 | xargs -0 chmod 555
+                find $storePath -type f -name "*-exec" -print0 | xargs --no-run-if-empty -0 chmod 555
+                find $storePath -type f -not -name "*-exec" -print0 | xargs --no-run-if-empty -0 chmod 444
+                find $storePath -type d -print0 | xargs --no-run-if-empty -0 chmod 555
               fi
 
               if [[ ${toString fetcherVersion} -ge 3 ]]; then

pkgs/by-name/ad/addwater/package.nix

@@ -15,7 +15,7 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "addwater";
-  version = "1.2.9.1";
+  version = "1.3";
   # built with meson, not a python format
   pyproject = false;
 
@@ -23,7 +23,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     owner = "largestgithubuseronearth";
     repo = "addwater";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MzazCEYJJNKLeQza9dxWCPBjBG8t2kW6UjttTZvUK1E=";
+    hash = "sha256-ynfBP3yFw4g8ebnKKyQDdmCB7APYVgvuedcu/x5lO9w=";
   };
 
   buildInputs = [

pkgs/by-name/an/ansel/package.nix

@@ -82,13 +82,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "ansel";
-  version = "0-unstable-2026-03-19";
+  version = "0-unstable-2026-04-21";
 
   src = fetchFromGitHub {
     owner = "aurelienpierreeng";
     repo = "ansel";
-    rev = "5e3e2918bf6f6ce1484f7f36b8f3ff6eee7e90d9";
-    hash = "sha256-TQjWBeVCC3fq+MGb0cC9ytbdXqJw2sOzzTcBEIxzP/M=";
+    rev = "01022024bc001987ac69308c8a5d1b2b4063f239";
+    hash = "sha256-vsy4oi0iK8P2UTk0C6X9j5ItOxIYJ2xuGXOAm4uioIA=";
     fetchSubmodules = true;
   };
 

pkgs/by-name/ar/armagetronad/package.nix

@@ -51,9 +51,9 @@ let
       # https://gitlab.com/armagetronad/armagetronad/-/tags
       ${latestVersionMajor} =
         let
-          version = "${latestVersionMajor}.2.5";
+          version = "${latestVersionMajor}.3.0";
           rev = "v${version}";
-          hash = "sha256-bj+oUqz0WHAjZ0iS7GlbIfLeMFSPQkH99mPaLdapkPo=";
+          hash = "sha256-xoUb0AAhaiAYA88Sn5/CfofMjGkYDLsCPVKwzHGz1XA=";
         in
         dedicatedServer: {
           inherit version;
@@ -72,8 +72,8 @@ let
       # https://gitlab.com/armagetronad/armagetronad/-/commits/trunk/?ref_type=heads
       ${unstableVersionMajor} =
         let
-          rev = "ec0dbb09ce081be2879acf67bebcd2a2987fd0a4";
-          hash = "sha256-8fH0Q0N2bKCO0t+lOs8EamThpiial2CfEcVP3cZbHX0=";
+          rev = "16da4a669d4c4d269132a903228918c2a8b87b08";
+          hash = "sha256-nTTJwxnTYP3kBxSMNpcYaKfMVGF6U/pYa2r10d8YdCE=";
         in
         dedicatedServer: {
           version = "${unstableVersionMajor}-${lib.substring 0 8 rev}";
@@ -94,12 +94,6 @@ let
             SDL2_mixer
           ];
           extraNativeBuildInputs = [ bison ];
-          # `label()` was removed in protobuf 34
-          # <https://github.com/protocolbuffers/protobuf/commit/b76faa921fdd244f374c7be0bddd4050fc42c292>
-          postPatch = ''
-            substituteInPlace src/network/nProtoBuf.cpp \
-              --replace-fail 'field->label() == FieldDescriptor::LABEL_REPEATED' 'field->is_repeated()'
-          '';
         };
 
       # https://gitlab.com/armagetronad/armagetronad/-/commits/hack-0.2.8-sty+ct+ap/?ref_type=heads

pkgs/by-name/ca/calibre-web/package.nix

@@ -133,6 +133,7 @@ python3Packages.buildPythonApplication rec {
     "lxml"
     "pypdf"
     "regex"
+    "requests"
     "tornado"
     "unidecode"
     "wand"

pkgs/by-name/ch/checkov/package.nix

@@ -35,14 +35,14 @@ let
 in
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "checkov";
-  version = "3.2.521";
+  version = "3.2.524";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     tag = finalAttrs.version;
-    hash = "sha256-xRVA5VPDevdq4LIcJRl/fbCn9iZA+pnw2hvDfHi0MIo=";
+    hash = "sha256-SgLAFltPChxWkzwshY25sekVQfg5V8BsjpKKnOLKE0s=";
   };
 
   pythonRelaxDeps = [

pkgs/by-name/ch/chef-cli/Gemfile.lock

@@ -1,12 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.8)
+    addressable (2.8.10)
       public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1213.0)
-    aws-sdk-core (3.242.0)
+    aws-partitions (1.1241.0)
+    aws-sdk-core (3.246.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -14,61 +14,68 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.121.0)
-      aws-sdk-core (~> 3, >= 3.241.4)
+    aws-sdk-kms (1.123.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.213.0)
-      aws-sdk-core (~> 3, >= 3.241.4)
+    aws-sdk-s3 (1.220.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-secretsmanager (1.128.0)
-      aws-sdk-core (~> 3, >= 3.241.4)
+    aws-sdk-secretsmanager (1.129.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.3.0)
+    bcrypt_pbkdf (1.1.2)
     benchmark (0.5.0)
-    bigdecimal (4.0.1)
+    bigdecimal (4.1.2)
     builder (3.3.0)
-    chef (18.3.0)
+    chef (19.2.12)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 18.3.0)
-      chef-utils (= 18.3.0)
+      bcrypt_pbkdf (~> 1.0)
+      chef-config (= 19.2.12)
+      chef-licensing (~> 1.3)
+      chef-utils (= 19.2.12)
       chef-vault
-      chef-zero (>= 14.0.11)
+      chef-zero (~> 15.1.0)
       corefoundation (~> 0.3.4)
-      diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0)
+      csv (~> 3.3.5)
+      diff-lcs (~> 1.6.0)
+      ed25519 (~> 1.2)
       erubis (~> 2.7)
-      ffi (>= 1.15.5)
+      ffi (>= 1.15.5, < 1.18.0)
       ffi-libarchive (~> 1.0, >= 1.0.3)
       ffi-yajl (~> 2.2)
       iniparse (~> 1.4)
-      inspec-core (>= 5)
+      inspec-core (~> 7.0.107)
       license-acceptance (>= 1.0.5, < 3)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (>= 2.1, < 4)
       mixlib-cli (>= 2.1.1, < 3.0)
       mixlib-log (>= 2.0.3, < 4.0)
-      mixlib-shellout (>= 3.1.1, < 4.0)
+      mixlib-shellout (~> 3.3.8)
       net-ftp
       net-sftp (>= 2.1.2, < 5.0)
-      ohai (~> 18.0)
+      ohai (~> 19.0)
       plist (~> 3.2)
       proxifier2 (~> 1.1)
+      syslog
       syslog-logger (~> 1.6)
-      train-core (~> 3.10)
+      train-core (~> 3.13, >= 3.13.4)
       train-rest (>= 0.4.1)
-      train-winrm (>= 0.2.5)
-      unf_ext (>= 0.0.8.2)
-      uuidtools (>= 2.1.5, < 3.0)
-      vault (~> 0.16)
-    chef-cli (5.6.23)
+      train-winrm (>= 0.2.17)
+      unf_ext (~> 0.0.9.1)
+      uri (~> 1.0.4)
+      vault (~> 0.18.2)
+    chef-cli (6.1.29)
       addressable (>= 2.3.5, < 2.9)
-      chef (~> 18.0)
+      chef (>= 18.0, < 20.0)
+      chef-licensing (~> 1.0)
       cookbook-omnifetch (~> 0.5)
-      diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0)
+      diff-lcs (~> 1.6)
       ffi-yajl (>= 1.0, < 3.0)
       license-acceptance (>= 1.0.11, < 3)
       minitar (~> 1.0)
@@ -76,17 +83,19 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
       pastel (~> 0.7)
       solve (> 2.0, < 5.0)
-    chef-config (18.3.0)
+      syslog (~> 0.3)
+    chef-config (19.2.12)
       addressable
-      chef-utils (= 18.3.0)
+      chef-utils (= 19.2.12)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
+      racc
       tomlrb (~> 1.2)
     chef-gyoku (1.5.0)
       builder (>= 2.1.2)
       rexml (~> 3.4)
-    chef-licensing (1.4.0)
+    chef-licensing (1.4.1)
       chef-config (>= 15)
       faraday (>= 1, < 3)
       faraday-http-cache
@@ -98,9 +107,9 @@ GEM
     chef-telemetry (1.1.1)
       chef-config
       concurrent-ruby (~> 1.0)
-    chef-utils (18.3.0)
+    chef-utils (19.2.12)
       concurrent-ruby
-    chef-vault (4.2.5)
+    chef-vault (4.2.9)
       syslog (~> 0.3)
     chef-winrm (2.5.0)
       builder (>= 2.1.2)
@@ -134,17 +143,17 @@ GEM
       webrick
     coderay (1.1.3)
     concurrent-ruby (1.3.6)
-    connection_pool (2.5.5)
     cookbook-omnifetch (0.12.2)
       mixlib-archive (>= 0.4, < 2.0)
-    cookstyle (8.5.3)
-      rubocop (= 1.81.7)
+    cookstyle (8.6.10)
+      rubocop (= 1.84.2)
     corefoundation (0.3.13)
       ffi (>= 1.15.0)
     csv (3.3.5)
     date (3.5.1)
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.2)
     domain_name (0.6.20240107)
+    ed25519 (1.4.0)
     erubi (1.13.1)
     erubis (2.7.0)
     faraday (2.14.1)
@@ -153,11 +162,11 @@ GEM
       logger
     faraday-follow_redirects (0.5.0)
       faraday (>= 1, < 3)
-    faraday-http-cache (2.6.1)
+    faraday-http-cache (2.7.0)
       faraday (>= 0.8)
     faraday-net_http (3.4.2)
       net-http (~> 0.5)
-    ffi (1.17.3)
+    ffi (1.17.4)
     ffi-libarchive (1.1.14)
       ffi (~> 1.0)
     ffi-yajl (2.7.7)
@@ -169,12 +178,12 @@ GEM
     hashie (5.1.0)
       logger
     http-accept (1.7.0)
-    http-cookie (1.1.0)
+    http-cookie (1.1.6)
       domain_name (~> 0.5)
     httpclient (2.9.0)
       mutex_m
     iniparse (1.5.0)
-    inspec-core (7.0.95)
+    inspec-core (7.0.107)
       addressable (~> 2.4)
       chef-licensing (>= 1.2.0)
       chef-telemetry (~> 1.0, >= 1.0.8)
@@ -199,13 +208,13 @@ GEM
       syslog (~> 0.1)
       thor (>= 0.20, < 1.5.0)
       tomlrb (>= 1.3, < 2.1)
-      train-core (~> 3.13, >= 3.13.4)
+      train-core (~> 3.16, >= 3.16.1)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
     io-console (0.8.2)
     ipaddress (0.8.3)
     jmespath (1.6.2)
-    json (2.18.1)
+    json (2.19.4)
     language_server-protocol (3.17.0.5)
     libyajl2 (2.1.0)
     license-acceptance (2.1.13)
@@ -223,7 +232,7 @@ GEM
     mime-types (3.7.0)
       logger
       mime-types-data (~> 3.2025, >= 3.2025.0507)
-    mime-types-data (3.2026.0203)
+    mime-types-data (3.2026.0414)
     minitar (1.1.0)
     mixlib-archive (1.3.3)
       mixlib-log
@@ -233,10 +242,10 @@ GEM
       tomlrb
     mixlib-log (3.2.3)
       ffi (>= 1.15.5)
-    mixlib-shellout (3.4.10)
+    mixlib-shellout (3.3.9)
       chef-utils
     molinillo (0.8.0)
-    multi_json (1.19.1)
+    multi_json (1.20.1)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     net-ftp (0.3.9)
@@ -244,34 +253,33 @@ GEM
       time
     net-http (0.9.1)
       uri (>= 0.11.1)
-    net-http-persistent (4.0.8)
-      connection_pool (>= 2.2.4, < 4)
     net-protocol (0.2.2)
       timeout
     net-scp (4.1.0)
       net-ssh (>= 2.6.5, < 8.0.0)
     net-sftp (4.0.0)
       net-ssh (>= 5.0.0, < 8.0.0)
-    net-ssh (7.3.0)
+    net-ssh (7.3.2)
     netrc (0.11.0)
     nori (2.7.1)
       bigdecimal
-    ohai (18.1.18)
-      chef-config (>= 14.12, < 19)
-      chef-utils (>= 16.0, < 19)
-      ffi (~> 1.9)
+    ohai (19.1.24)
+      base64
+      chef-config (>= 14.12, < 20)
+      chef-utils (>= 16.0, < 20)
+      ffi (>= 1.15.5)
       ffi-yajl (~> 2.2)
       ipaddress
       mixlib-cli (>= 1.7.0)
       mixlib-config (>= 2.0, < 4.0)
       mixlib-log (>= 2.0.1, < 4.0)
-      mixlib-shellout (~> 3.2, >= 3.2.5)
+      mixlib-shellout (~> 3.3.6)
       plist (~> 3.1)
       train-core
       wmi-lite (~> 1.0)
     ostruct (0.6.3)
-    parallel (1.27.0)
-    parser (3.3.10.1)
+    parallel (1.28.0)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -285,13 +293,13 @@ GEM
       method_source (~> 1.0)
       reline (>= 0.6.0)
     pstore (0.1.4)
-    public_suffix (7.0.2)
+    public_suffix (7.0.5)
     racc (1.8.1)
-    rack (3.2.4)
+    rack (3.2.6)
     rackup (2.3.1)
       rack (>= 3)
     rainbow (3.1.1)
-    regexp_parser (2.11.3)
+    regexp_parser (2.12.0)
     reline (0.6.3)
       io-console (~> 0.5)
     rest-client (2.1.0)
@@ -312,11 +320,11 @@ GEM
     rspec-its (2.0.0)
       rspec-core (>= 3.13.0)
       rspec-expectations (>= 3.13.0)
-    rspec-mocks (3.13.7)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    rubocop (1.81.7)
+    rubocop (1.84.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -324,10 +332,10 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.47.1, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.0)
+    rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
     ruby-progressbar (1.13.0)
@@ -351,12 +359,12 @@ GEM
     thor (1.4.0)
     time (0.4.2)
       date
-    timeout (0.6.0)
+    timeout (0.6.1)
     tomlrb (1.3.0)
-    train-core (3.16.1)
+    train-core (3.16.2)
       addressable (~> 2.5)
       ffi (>= 1.16.0, < 1.18)
-      json (>= 1.8, < 3.0)
+      json (>= 2.19.2, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
       net-scp (>= 1.2, < 5.0)
       net-ssh (>= 2.9, < 8.0)
@@ -392,13 +400,10 @@ GEM
     unf_ext (0.0.9.1)
     unicode-display_width (2.6.0)
     unicode_utils (1.4.0)
-    uri (1.1.1)
+    uri (1.0.4)
     uuidtools (2.2.0)
-    vault (0.20.0)
+    vault (0.18.2)
       aws-sigv4
-      base64
-      connection_pool (~> 2.4)
-      net-http-persistent (~> 4.0, >= 4.0.2)
     webrick (1.9.2)
     wisper (2.0.1)
     wmi-lite (1.0.7)

pkgs/by-name/ch/chef-cli/gemset.nix

@@ -5,10 +5,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mxhjgihzsx45l9wh2n0ywl9w0c6k70igm5r0d63dxkcagwvh4vw";
+      sha256 = "031lb8jq55dxb5qiknzffl7nniqfmrc4603ggxqipnxywwp5ca6a";
       type = "gem";
     };
-    version = "2.8.8";
+    version = "2.8.10";
   };
   ast = {
     groups = [ "default" ];
@@ -35,10 +35,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pp0sagj31zvmv8ca0hf0kgdfb7wwkq733sv2812gvs43pck5hay";
+      sha256 = "1gkc08r1s7mvinl7301rahylj3z7myypdbkpvj5jwy72bm1zq3nd";
       type = "gem";
     };
-    version = "1.1213.0";
+    version = "1.1241.0";
   };
   aws-sdk-core = {
     dependencies = [
@@ -54,10 +54,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1819b99lgs3i637j2y6f95vlsppw3id2hys3m30q13f7mh1k0yy1";
+      sha256 = "1k6xqkipjli9vl40d4wqxcl7035lav9f9hnczilhwmj8i7n68f1r";
       type = "gem";
     };
-    version = "3.242.0";
+    version = "3.246.0";
   };
   aws-sdk-kms = {
     dependencies = [
@@ -68,10 +68,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1q015l5gm3f230jz9l6si9s3hlw7ra76q8biqvxlwxdmnk7w2qym";
+      sha256 = "080zh4g1lcjl0bz2l0gjm8vmpd60cvi0p658bh235ypqh9zg61fl";
       type = "gem";
     };
-    version = "1.121.0";
+    version = "1.123.0";
   };
   aws-sdk-s3 = {
     dependencies = [
@@ -83,10 +83,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "03g5k3jl0sgp60ppmxa267qflxlj174mrs8hnrnl10j5ak7nqndg";
+      sha256 = "0z4cl87lbyw9qgp1l52sbjnysw63zmxih9wfhjfdvv67d9gdlzr3";
       type = "gem";
     };
-    version = "1.213.0";
+    version = "1.220.0";
   };
   aws-sdk-secretsmanager = {
     dependencies = [
@@ -97,10 +97,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "16ib5p04fk66qr2vfps0qr340ld5xb5dsypbdii9f40n6hfxwb6n";
+      sha256 = "0m69f1jghxlixd4b5wb2dsp38dly7nxm5si1klnajv89m23mqi00";
       type = "gem";
     };
-    version = "1.128.0";
+    version = "1.129.0";
   };
   aws-sigv4 = {
     dependencies = [ "aws-eventstream" ];
@@ -123,6 +123,16 @@
     };
     version = "0.3.0";
   };
+  bcrypt_pbkdf = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1xjcp484qc4j4z42b087npgj50sd6yixchznp4z9p1k6rqilqhf2";
+      type = "gem";
+    };
+    version = "1.1.2";
+  };
   benchmark = {
     groups = [ "default" ];
     platforms = [ ];
@@ -138,10 +148,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19y406nx17arzsbc515mjmr6k5p59afprspa1k423yd9cp8d61wb";
+      sha256 = "1g9zi8c4i7g8zz0c3hxrw6mblrjvgn7akys60clb9si7c1k1gljk";
       type = "gem";
     };
-    version = "4.0.1";
+    version = "4.1.2";
   };
   builder = {
     groups = [ "default" ];
@@ -158,12 +168,16 @@
       "addressable"
       "aws-sdk-s3"
       "aws-sdk-secretsmanager"
+      "bcrypt_pbkdf"
       "chef-config"
+      "chef-licensing"
       "chef-utils"
       "chef-vault"
       "chef-zero"
       "corefoundation"
+      "csv"
       "diff-lcs"
+      "ed25519"
       "erubis"
       "ffi"
       "ffi-libarchive"
@@ -181,27 +195,29 @@
       "ohai"
       "plist"
       "proxifier2"
+      "syslog"
       "syslog-logger"
       "train-core"
       "train-rest"
       "train-winrm"
       "unf_ext"
-      "uuidtools"
+      "uri"
       "vault"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1iafkrjiwkrv3mn420byr96y3g8ik4bqbfms3yqvhyfjx1c2z6fz";
+      sha256 = "1iqg9vk9h40szvn1y5z1n1xs02l5n2bw5sahas2mx5ira2rs09d4";
       type = "gem";
     };
-    version = "18.3.0";
+    version = "19.2.12";
   };
   chef-cli = {
     dependencies = [
       "addressable"
       "chef"
+      "chef-licensing"
       "cookbook-omnifetch"
       "diff-lcs"
       "ffi-yajl"
@@ -211,15 +227,16 @@
       "mixlib-shellout"
       "pastel"
       "solve"
+      "syslog"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mx7scgzkzsz5z9fpzk7ccng7yjv45pjp705h386fzmj6gl2w1rg";
+      sha256 = "1x3n57wb0zxqij8gccp4ss34i3w2xnh3qqzf6cqgav806sb5pyrz";
       type = "gem";
     };
-    version = "5.6.23";
+    version = "6.1.29";
   };
   chef-config = {
     dependencies = [
@@ -228,16 +245,17 @@
       "fuzzyurl"
       "mixlib-config"
       "mixlib-shellout"
+      "racc"
       "tomlrb"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1pvjf3qbb3apg9vdy4zykamm7801qz4m6256wjqn73fs87zs50y1";
+      sha256 = "0999pzgsypcy5wvr42p3iagl4c96glcwfk08vlpxrc05q4jqwf24";
       type = "gem";
     };
-    version = "18.3.0";
+    version = "19.2.12";
   };
   chef-gyoku = {
     dependencies = [
@@ -268,10 +286,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1xwk8dq0rbzirfxksx5yxfzwwkslxqi4ym024ayf0kd60i88cxdz";
+      sha256 = "0snnw3b3h0fydbllkgfc6gv724rlg7pv8lr9q84c972aibdsxs7h";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "1.4.1";
   };
   chef-telemetry = {
     dependencies = [
@@ -293,10 +311,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0087jwhqslfm3ygj507dmmdp3k0589j5jl54mkwgbabbwan7lzw2";
+      sha256 = "17jkln8gnxymvppnsbhzjza4gbhwc52shhql3yl1cn5c0lpsf0hb";
       type = "gem";
     };
-    version = "18.3.0";
+    version = "19.2.12";
   };
   chef-vault = {
     dependencies = [ "syslog" ];
@@ -304,10 +322,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "021lnj0w1lmbf5r7b4yjh8xrdxqqwi9qpynzncnsfd7v75qppjg2";
+      sha256 = "0jv3mn4z650a8jbncyvz0sfb7kgwlz4rwhxw6k0f7q8m49p6mw7z";
       type = "gem";
     };
-    version = "4.2.5";
+    version = "4.2.9";
   };
   chef-winrm = {
     dependencies = [
@@ -403,16 +421,6 @@
     };
     version = "1.3.6";
   };
-  connection_pool = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1b8nlxr5z843ii7hfk6igpr5acw3k2ih9yjrgkyz2gbmallgjkz5";
-      type = "gem";
-    };
-    version = "2.5.5";
-  };
   cookbook-omnifetch = {
     dependencies = [ "mixlib-archive" ];
     groups = [ "default" ];
@@ -430,10 +438,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "04xbjydimr144rnl1azhc3hignpdpi0s1rb0xzzbi1v2may7lwn0";
+      sha256 = "0mxznj53rlcg9bcycf5i6jximl1b5mdhm4x0k0wfb8xa79zz57cv";
       type = "gem";
     };
-    version = "8.5.3";
+    version = "8.6.10";
   };
   corefoundation = {
     dependencies = [ "ffi" ];
@@ -471,10 +479,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7";
+      sha256 = "0qlrj2qyysc9avzlr4zs1py3x684hqm61n4czrsk1pyllz5x5q4s";
       type = "gem";
     };
-    version = "1.5.1";
+    version = "1.6.2";
   };
   domain_name = {
     groups = [ "default" ];
@@ -486,6 +494,16 @@
     };
     version = "0.6.20240107";
   };
+  ed25519 = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "01n5rbyws1ijwc5dw7s88xx3zzacxx9k97qn8x11b6k8k18pzs8n";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
   erubi = {
     groups = [ "default" ];
     platforms = [ ];
@@ -538,10 +556,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "11a27jbbbkawakwf8dll9qqc7g0mkc31zv1d8m1h477yqmhswwkp";
+      sha256 = "128dkxqssnnz801z86ykpaq4sv7pnac5yrgngbm951f0wsxw8ynd";
       type = "gem";
     };
-    version = "2.6.1";
+    version = "2.7.0";
   };
   faraday-net_http = {
     dependencies = [ "net-http" ];
@@ -559,10 +577,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0k1xaqw2jk13q3ss7cnyvkp8fzp75dk4kazysrxgfd1rpgvkk7qf";
+      sha256 = "1kqasqvy8d7r09ri4n6bkdwbk63j7afd9ilsw34nzlgh0qp69ldw";
       type = "gem";
     };
-    version = "1.17.3";
+    version = "1.17.4";
   };
   ffi-libarchive = {
     dependencies = [ "ffi" ];
@@ -637,10 +655,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "06dvmngd4hwrr6k774i1h6c50h2l8nww9f1id0wvrvi72l6yd99q";
+      sha256 = "1aga7z4p0dka4zcqw9i05wa4ab1q7h7cgnj328ldqqfycjz84jxs";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.1.6";
   };
   httpclient = {
     dependencies = [ "mutex_m" ];
@@ -697,10 +715,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mghshl98py0q1wwd2dbmx72b1641y0nqz7y68bpws1b8n2hy5df";
+      sha256 = "1wjb8ap6z5nvsqlch7bx66p620rh2skxz4niawizff1y9zcfa23x";
       type = "gem";
     };
-    version = "7.0.95";
+    version = "7.0.107";
   };
   io-console = {
     groups = [ "default" ];
@@ -737,10 +755,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "11prr7nrxh1y4rfsqa51gy4ixx63r18cz9mdnmk0938va1ajf4gy";
+      sha256 = "1b1rabz30grash5wh0lcv109w2ggggmmbclwnajqrcdk7wrps2k7";
       type = "gem";
     };
-    version = "2.18.1";
+    version = "2.19.4";
   };
   language_server-protocol = {
     groups = [ "default" ];
@@ -851,10 +869,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0bradmf21c9g4z6f3hvqmnf6i2sbgp0630y2j5rq8a7h79lksdal";
+      sha256 = "1k28j6ww8rf43r5i8278jvm2cq3pnzsvqm7yqpb4p93kadjlq726";
       type = "gem";
     };
-    version = "3.2026.0203";
+    version = "3.2026.0414";
   };
   minitar = {
     groups = [ "default" ];
@@ -925,10 +943,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "032z85m9w8kpf232xspd9r8im6wwq4lj2s7df642m4lhdid6r2kw";
+      sha256 = "126k9zgxwj726gi0q0ywj4kdzf1gfm8z16i1nn7dw9kmn3imxpqf";
       type = "gem";
     };
-    version = "3.4.10";
+    version = "3.3.9";
   };
   molinillo = {
     groups = [ "default" ];
@@ -945,10 +963,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1drisvysgvnjlz49a0qcbs294id6mvj3i8iik5rvym68ybwfzvvs";
+      sha256 = "0vfaab23d85617ps412ydb8ap4ci1sfzi8ainn8yyifc0pl38f9g";
       type = "gem";
     };
-    version = "1.19.1";
+    version = "1.20.1";
   };
   multipart-post = {
     groups = [ "default" ];
@@ -995,17 +1013,6 @@
     };
     version = "0.9.1";
   };
-  net-http-persistent = {
-    dependencies = [ "connection_pool" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1rk03449disq3azyiymv1c3qnpqr6cxawgq556rkf5b9klqyhggg";
-      type = "gem";
-    };
-    version = "4.0.8";
-  };
   net-protocol = {
     dependencies = [ "timeout" ];
     groups = [ "default" ];
@@ -1044,10 +1051,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1w1ypxa3n6mskkwb00b489314km19l61p5h3bar6zr8cng27c80p";
+      sha256 = "1m1d6rs40rjvdb6df34fi3za1c2ajdiydv4jzpjj03iq7hhrw0k5";
       type = "gem";
     };
-    version = "7.3.0";
+    version = "7.3.2";
   };
   netrc = {
     groups = [ "default" ];
@@ -1072,6 +1079,7 @@
   };
   ohai = {
     dependencies = [
+      "base64"
       "chef-config"
       "chef-utils"
       "ffi"
@@ -1089,10 +1097,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1w0zrk1n6n7jl493k4vv5xaiszbmxsmaffy9xvykbfawjjb83vj2";
+      sha256 = "0n3prpm36kxxk0jx8qs90gj72382jw7az9rnqnaa88c35793ypx1";
       type = "gem";
     };
-    version = "18.1.18";
+    version = "19.1.24";
   };
   ostruct = {
     groups = [ "default" ];
@@ -1109,10 +1117,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0c719bfgcszqvk9z47w2p8j2wkz5y35k48ywwas5yxbbh3hm3haa";
+      sha256 = "0w697335hi5dk5ay9kyn53399sy87y8v0y6ij93m5wmshhadxrik";
       type = "gem";
     };
-    version = "1.27.0";
+    version = "1.28.0";
   };
   parser = {
     dependencies = [
@@ -1123,10 +1131,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1256ws3w3gnfqj7r3yz2i9y1y7k38fhjphxpybkyb4fds8jsgxh6";
+      sha256 = "0m2xqvn1la62hji1mn04y59giikww95p2hs0r4y2rrz3mdxcwyni";
       type = "gem";
     };
-    version = "3.3.10.1";
+    version = "3.3.11.1";
   };
   parslet = {
     groups = [ "default" ];
@@ -1209,10 +1217,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mx84s7gn3xabb320hw8060v7amg6gmcyyhfzp0kawafiq60j54i";
+      sha256 = "08znfv30pxmdkjyihvbjqbvv874dj3nybmmyscl958dy3f7v12qs";
       type = "gem";
     };
-    version = "7.0.2";
+    version = "7.0.5";
   };
   racc = {
     groups = [ "default" ];
@@ -1229,10 +1237,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1xmnrk076sqymilydqgyzhkma3hgqhcv8xhy7ks479l2a3vvcx2x";
+      sha256 = "1hhjy9gcp52dzij05gmidqac8g28ski5xm67prwmdqmjfcgqxmsy";
       type = "gem";
     };
-    version = "3.2.4";
+    version = "3.2.6";
   };
   rackup = {
     dependencies = [ "rack" ];
@@ -1260,10 +1268,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "192mzi0wgwl024pwpbfa6c2a2xlvbh3mjd75a0sakdvkl60z64ya";
+      sha256 = "1fwfw26a32rps78920nn29shqg2zmqv72i89j1fap41isshida9m";
       type = "gem";
     };
-    version = "2.11.3";
+    version = "2.12.0";
   };
   reline = {
     dependencies = [ "io-console" ];
@@ -1365,10 +1373,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "071bqrk2rblk3zq3jk1xxx0dr92y0szi5pxdm8waimxici706y89";
+      sha256 = "0iqxmw0knjiz5nf6pgr8ihs6cjzh89f0ppj3fqiz8cvms79x6sh8";
       type = "gem";
     };
-    version = "3.13.7";
+    version = "3.13.8";
   };
   rspec-support = {
     groups = [ "default" ];
@@ -1397,10 +1405,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "157hg99cq6ys670sw8xbggnvxc9yl50h1zhllki925kkihlwrdbg";
+      sha256 = "0pxzipl8a1bv62jdfykh7j4ymdr4aiffjvwsny6drwv886jwx4jn";
       type = "gem";
     };
-    version = "1.81.7";
+    version = "1.84.2";
   };
   rubocop-ast = {
     dependencies = [
@@ -1411,10 +1419,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1zbikzd6237fvlzjfxdlhwi2vbmavg1cc81y6cyr581365nnghs9";
+      sha256 = "0dahfpnzz63hyqxa03x8rypnrxzwyvh4i5a8ri34bzpnf3pg64j4";
       type = "gem";
     };
-    version = "1.49.0";
+    version = "1.49.1";
   };
   ruby-progressbar = {
     groups = [ "default" ];
@@ -1563,10 +1571,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bz11pq7n1g51f50jqmgyf5b1v64p1pfqmy5l21y6vpr37b2lwkd";
+      sha256 = "1jxcji88mh6xsqz0mfzwnxczpg7cyniph7wpavnavfz7lxl77xbq";
       type = "gem";
     };
-    version = "0.6.0";
+    version = "0.6.1";
   };
   tomlrb = {
     groups = [ "default" ];
@@ -1591,10 +1599,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1paxsm06cbhq73k8p4fnb184774w0rrycwzg78lh9awlv6s3wgxw";
+      sha256 = "1vz9ylinr4fbca7ab7ipv57hxd988a13b0vlwrhlxhckdaf215cg";
       type = "gem";
     };
-    version = "3.16.1";
+    version = "3.16.2";
   };
   train-rest = {
     dependencies = [
@@ -1762,10 +1770,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ijpbj7mdrq7rhpq2kb51yykhrs2s54wfs6sm9z3icgz4y6sb7rp";
+      sha256 = "0jrl2vkdvc5aq8q3qvjmmrgjxfm784w8h7fal19qg7q7gh9msj1l";
       type = "gem";
     };
-    version = "1.1.1";
+    version = "1.0.4";
   };
   uuidtools = {
     groups = [ "default" ];
@@ -1778,20 +1786,15 @@
     version = "2.2.0";
   };
   vault = {
-    dependencies = [
-      "aws-sigv4"
-      "base64"
-      "connection_pool"
-      "net-http-persistent"
-    ];
+    dependencies = [ "aws-sigv4" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0wycd7g00ji9fqlk4ka0qm5fbs37xxd273g8zsnfql61vhf5h83w";
+      sha256 = "0z6j8s8cdmkbwzfis3dpk5dm91zi5fasids8npzrxhb4hcnnqd19";
       type = "gem";
     };
-    version = "0.20.0";
+    version = "0.18.2";
   };
   webrick = {
     groups = [ "default" ];

pkgs/by-name/co/context7-mcp/package.nix

@@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "context7-mcp";
-  version = "2.1.8";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "upstash";
     repo = "context7";
     tag = "${tag-prefix}@${finalAttrs.version}";
-    hash = "sha256-TMvDzDcZd9hoYI84x+jewOJYkSrb1qwVRTdzD2SwG4U=";
+    hash = "sha256-MFHajv1f+Xj8BtiiDQs4Sct1IhYS4+hYY+PdVAYqkNw=";
   };
 
   nativeBuildInputs = [
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 3;
-    hash = "sha256-MHKzlxlyvQoLvoLomhToaZgnPU7H6iHLmokhotZF6VY=";
+    hash = "sha256-f3PXpCdmKh2LPD5VyFsRdLR7CEvh+GozkQFSeeNuj2c=";
   };
 
   buildPhase = ''

pkgs/by-name/da/dante/package.nix

@@ -37,7 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
     if !stdenv.hostPlatform.isDarwin then
       [ "--with-libc=libc.so.6" ]
     else
-      [ "--with-libc=libc${stdenv.hostPlatform.extensions.sharedLibrary}" ];
+      [
+        "--with-libc=libc${stdenv.hostPlatform.extensions.sharedLibrary}"
+        "CFLAGS=-std=gnu17"
+      ];
 
   dontAddDisableDepTrack = stdenv.hostPlatform.isDarwin;
 

pkgs/by-name/dy/dyff/package.nix

@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "dyff";
-  version = "1.11.3";
+  version = "1.11.4";
 
   src = fetchFromGitHub {
     owner = "homeport";
     repo = "dyff";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-3zfKEyVVqbzlqQ0GMjIgrIUFtsKEgu+/EEYhSGu9Fgs=";
+    sha256 = "sha256-ca7mNC5QVAZIfxHBAkIffBiuQa6VKNObO5XTnoR1i0k=";
   };
 
-  vendorHash = "sha256-hxDDfxLCGov0IYYy9wn5bub7qiGUdjsNfFbvuWAgHH4=";
+  vendorHash = "sha256-XGEe7uunEWmiOTWF7sOBDNh3GZ2f1pCvm8HTyS+gOWY=";
 
   subPackages = [
     "cmd/dyff"

pkgs/by-name/ec/ec/package.nix

@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "ec";
-  version = "0.3.1";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "chojs23";
     repo = "ec";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tnOr0AVPwEm9gONa7gl3TzhPC5/1WEAbW7Ew5/mNn5U=";
+    hash = "sha256-Oltl23Ihv2p1sTW62nGUt+oH6E2DB38fIuNiXRaghBU=";
   };
 
   vendorHash = "sha256-bV5y8zKculYULkFl9J95qebLOzdTT/LuYycqMmHKZ+g=";

pkgs/by-name/en/encrypted-dns-server/package.nix

@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "encrypted-dns-server";
-  version = "0.9.18";
+  version = "0.9.19";
 
   src = fetchFromGitHub {
     owner = "DNSCrypt";
     repo = "encrypted-dns-server";
     tag = finalAttrs.version;
-    hash = "sha256-YM9ow1j5G6AN91/YLnRy+jOlpQPBxZa+chNZNPGUfhs=";
+    hash = "sha256-c1QamH+MiB4uDbRQx/uzh8HNyQ9npBeMUprM4V8VKLo=";
   };
 
-  cargoHash = "sha256-cHARkL8gbNBlmjbJaHJ8w268KcXTJr2PvCF+I6+K0s8=";
+  cargoHash = "sha256-io8ejF7ShSDJVadp7cPdkCfZy/mv0v4wwuvrCtkxnTE=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/fi/firefly-iii/package.nix

@@ -16,13 +16,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "firefly-iii";
-  version = "6.5.9";
+  version = "6.6.1";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "firefly-iii";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8Orha6/cLjE9J01m77LwpvXlYrOmb/28TzxQ/RJdvDQ=";
+    hash = "sha256-JnErWcq7aVkeZAIaINSEqmi/Fi/9wrPqFZ583EG8qyg=";
   };
 
   buildInputs = [ php ];
@@ -40,13 +40,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname src version;
     composerStrictValidation = true;
     strictDeps = true;
-    vendorHash = "sha256-9TTlMVlW7aXckIgpB5M0IxcLDtHqMboQgP00pmfK1zg=";
+    vendorHash = "sha256-iYW5GrUaHwoJzv4WN1r5YPEMUOH15A4BmOSlKIqCcdg=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-UyViUi/bIXK2aIzRgYe3oTyIMBRHpKYHIIEb6Qq1Jkk=";
+    hash = "sha256-6zha6lTkdrcMc9EAhFvSg1LRAw0HJlUITPqguCVrx+8=";
   };
 
   preInstall = ''

pkgs/by-name/fo/fontmatrix/package.nix

@@ -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;
-  };
-}

pkgs/by-name/fw/fwup/package.nix

@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fwup";
-  version = "1.15.0";
+  version = "1.15.1";
 
   src = fetchFromGitHub {
     owner = "fhunleth";
     repo = "fwup";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kVkw+/Z3+ZM1wXV/OmfaVPoUKc6MRuz8GRwpvOscuEM=";
+    hash = "sha256-SIRDVlC/g+rq5m4Ind7dqPzjdCjAxRK/kAdXt6byL/8=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/fz/fzf/package.nix

@@ -12,13 +12,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "fzf";
-  version = "0.71.0";
+  version = "0.72.0";
 
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = "fzf";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-fEHNE51VTggSwNutefCg/WueaXRE1J0D/dyVPFqhTJg=";
+    hash = "sha256-rUxbC2+VASAEBmL8WOpywk0SD0gyHArisl4pxnqK32I=";
   };
 
   vendorHash = "sha256-uFXHoseFOxGIGPiWxWfDl339vUv855VHYgSs9rnDyuI=";

pkgs/by-name/gi/git-pages-cli/package.nix

@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "git-pages-cli";
-  version = "1.8.0";
+  version = "1.8.2";
 
   src = fetchFromCodeberg {
     owner = "git-pages";
     repo = "git-pages-cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-xM2/7cg9ZZ5wWzlJdtmU1lHYhXQQinp8S643IKzTb7U=";
+    hash = "sha256-wNHwkVvC4NlQw1cx+rM6zdmYm4zTz/e5suIcapTtssY=";
   };
 
   vendorHash = "sha256-lGnl1onxJ9x0UIf2uPZcZgx2qbj/43VG+UcQvqwd1uw=";

pkgs/by-name/go/go-judge/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "go-judge";
-  version = "1.11.4";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "criyle";
     repo = "go-judge";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ypq44MGx4wyT4/31dF/e7zOS3I2MJPEZKcy//Zz4P0E=";
+    hash = "sha256-JxYdoDSkzb+BM76m+qzdLM31ox9jqCm3LDrjTn6q1/E=";
   };
 
-  vendorHash = "sha256-INPW1VuZ4U0Dv+p4utOZOtCU5VOBivSSPnErSdqH6Po=";
+  vendorHash = "sha256-7DwEATr5AZGXHJXwDxjLpERquXFYm3AYjU/g3v7Xmlw=";
 
   tags = [
     "nomsgpack"

pkgs/by-name/gr/gradia/0001-fix-image_stack-action-target-type.patch

@@ -1,13 +0,0 @@
-diff --git a/data/ui/image_stack.blp b/data/ui/image_stack.blp
-index 478bc8c..021388b 100644
---- a/data/ui/image_stack.blp
-+++ b/data/ui/image_stack.blp
-@@ -94,7 +94,7 @@ template $GradiaImageStack: Adw.Bin {
-                       icon-name: "sidebar-show-symbolic";
-                       tooltip-text: _("Open Sidebar");
-                       action-name: "win.sidebar-shown";
--                      action-target: true;
-+                      action-target: "true";
-                       visible: false;
- 
-                       styles [

pkgs/by-name/gr/gradia/package.nix

@@ -24,14 +24,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "gradia";
-  version = "1.12.0";
+  version = "1.13.0";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "AlexanderVanhee";
     repo = "Gradia";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iYqMuqq2AmrdNMa7dkDUGg1+gCG7wL/rDEdWAPfcQnw=";
+    hash = "sha256-9gxxl59jceZZIja/fg7ygbhjcHUo4TEEnK/IzJLsRgM=";
   };
 
   nativeBuildInputs = [
@@ -55,10 +55,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
     tesseract
   ];
 
-  patches = [
-    ./0001-fix-image_stack-action-target-type.patch
-  ];
-
   postPatch = ''
     substituteInPlace meson.build \
       --replace "/app/bin/tesseract" "${lib.getExe tesseract}"

pkgs/by-name/ha/havn/package.nix

@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "havn";
-  version = "0.3.5";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "mrjackwills";
     repo = "havn";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cYhhNhrMrPvqEIrb9Vznap8UW2ZNhGSzsAEmgtGfmy4=";
+    hash = "sha256-eQyWaAPDnfAXvqOVNI9luZIdLMSj1P779yiWOhZ5dsg=";
   };
 
-  cargoHash = "sha256-wcAdRS/ACBbnwN+vKmBLOpxw4SbrfTYo+E32PX6btTs=";
+  cargoHash = "sha256-pnXPIEVzAn6ovNo7+3BNzFptleOPFDklSU/e44roahs=";
 
   checkFlags = [
     # Skip tests that require network access

pkgs/by-name/jj/jjui/package.nix

@@ -8,13 +8,13 @@
 }:
 buildGo125Module (finalAttrs: {
   pname = "jjui";
-  version = "0.10.3";
+  version = "0.10.4";
 
   src = fetchFromGitHub {
     owner = "idursun";
     repo = "jjui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8ckAZb6wNCkocQl2v0VCIii64W5B7VG8LFlnwhQIAT4=";
+    hash = "sha256-20NWoojFBwHs33NFNeZbk1kiZ418kYD42XTUOHuQtv8=";
   };
 
   vendorHash = "sha256-AJlJ9iHkkWNS8a4oGt8AG89StjMH9UH3WuOcZwa3VS8=";

pkgs/by-name/kd/kdash/package.nix

@@ -11,13 +11,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "kdash";
-  version = "1.0.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "kdash-rs";
     repo = "kdash";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-1ZG0u4k95tm+k/cvLIzWD/pvVrdP3+ivTqtKr3Pniqw=";
+    sha256 = "sha256-yIBBWtdIvx9lMU9hoh0bsqYqXkSSBtfOMmUxM5UR+IQ=";
   };
 
   nativeBuildInputs = [
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # Fix for build failure with gcc15
   env.NIX_CFLAGS_COMPILE = "-std=gnu17";
 
-  cargoHash = "sha256-zcvlR7BDkeTcwhGi2Fyz2VdfZH4+JOMRTIjIXkTAHOU=";
+  cargoHash = "sha256-eRXW3EBkNMClxLUKufhrz9WJVBY5UTA/JnabGJvAvF4=";
 
   meta = {
     description = "Simple and fast dashboard for Kubernetes";

pkgs/by-name/li/lilo/package.nix

@@ -21,7 +21,8 @@ stdenv.mkDerivation (finalAttrs: {
   # Workaround build failure on -fno-common toolchains:
   #   ld: identify.o:(.bss+0x0): multiple definition of `identify';
   #     common.o:(.bss+0x160): first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
+  # Without -std=gnu17, compilation fails with an error on incompatible pointer types
+  env.NIX_CFLAGS_COMPILE = "-fcommon -std=gnu17";
 
   makeFlags = [
     "DESTDIR=${placeholder "out"}"

pkgs/by-name/lk/lk-jwt-service/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "lk-jwt-service";
-  version = "0.4.3";
+  version = "0.4.4";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "lk-jwt-service";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ThmQeXSzjpfPbgjvBITtracM4Hdx3gJbqhwk2OC7Y54=";
+    hash = "sha256-BwFcknSXC3uZfSlS0a420/WpUn/ji2m9x65zKi3bumE=";
   };
 
   vendorHash = "sha256-1D04GhXhGrOcRn8G+xY+3XEdgUBSWHis4DiKQ4gGNDw=";

pkgs/by-name/mi/misconfig-mapper/package.nix

@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "misconfig-mapper";
-  version = "1.15.4";
+  version = "1.15.5";
 
   src = fetchFromGitHub {
     owner = "intigriti";
     repo = "misconfig-mapper";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-U4zr+5TD8/rjCv1Ldmie52FZulfohfud72Gyivj2Zko=";
+    hash = "sha256-FZN/FGp2hQWaO0OnRzSmHx10Wb2rvhC6MpX/q97N/uQ=";
   };
 
   vendorHash = "sha256-eQetkCrVlYtiXezFzj35TnYAt6tntzUuJHqRvWEkuC4=";

pkgs/by-name/mu/mujoco/package.nix

@@ -82,7 +82,10 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mujoco";
-  version = "3.7.0";
+  version = "3.8.0";
+
+  __structuredAttrs = true;
+  strictDeps = true;
 
   # Bumping version? Make sure to look though the MuJoCo's commit
   # history for bumped dependency pins!
@@ -90,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "google-deepmind";
     repo = "mujoco";
     tag = finalAttrs.version;
-    hash = "sha256-Ti5Pdr25fck5IdgumiuLIcrI403XawbTePMJY1Fg6/A=";
+    hash = "sha256-X/Aqab5CZX+HbGLZBgtGB08XaNno5883c2yLuRRSkAM=";
   };
 
   patches = [

pkgs/by-name/nh/nh-unwrapped/package.nix

@@ -11,12 +11,12 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nh-unwrapped";
-  version = "4.3.1";
+  version = "4.3.2";
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8W7devMLhnnQcb2C8TDA6FoXlPR2RRN/zpB6C4ZIa3E=";
+    hash = "sha256-TSXa6nL2TpOfDCsZIGCFAMbkQy2Z40gam7JrxBy5FGY=";
   };
 
   strictDeps = true;
@@ -100,7 +100,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       rm $out/bin/xtask
     '';
 
-  cargoHash = "sha256-TpfxtTVZJhbJtPTPaTrUTTZmB+ZMdcB67kqid87vlOY=";
+  cargoHash = "sha256-ZR8vvG2mXrGg6GeyP7C0uWhPW6cp2QPYj2cOJUSyeAs=";
 
   passthru.updateScript = nix-update-script { };
 

pkgs/by-name/op/opencode/package.nix

@@ -16,13 +16,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "1.14.24";
+  version = "1.14.25";
 
   src = fetchFromGitHub {
     owner = "anomalyco";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4GL+Lsdzea5nrLNq5Ld0EuiVVuiwTJUIrxdAdAJme1I=";
+    hash = "sha256-v1aaq4HWAJ5wZm9bUeaRkyKr0iYjdOhigr/I31wwhEk=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -75,7 +75,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = "sha256-wQmsgZQGoedvn2RHINfKh9cVwSNYgkGaBOdV/AD70jQ=";
+    outputHash = "sha256-r0UCWhxIB4q4Te+LpXNcfexjfmI4Th2swfWOL3cUp3g=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };

pkgs/by-name/op/opentabletdriver/package.nix

@@ -23,13 +23,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "OpenTabletDriver";
-  version = "0.6.6.2";
+  version = "0.6.7";
 
   src = fetchFromGitHub {
     owner = "OpenTabletDriver";
     repo = "OpenTabletDriver";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OeioFdevYPiLl9w7FXVmpbcp1cIMoMYnSLgoBisOOOU=";
+    hash = "sha256-jL3d1DjY9n85BrO6ajZVvJMHmPYfxng4YE25s/9hfGA=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;
@@ -91,6 +91,8 @@ buildDotnetModule (finalAttrs: {
       --replace-fail '/usr/bin/env rm' '${lib.getExe' coreutils "rm"}'
   '';
 
+  dontWrapGApps = true;
+
   postFixup = ''
     # Give a more "*nix" name to the binaries
     mv $out/bin/OpenTabletDriver.Console $out/bin/otd
@@ -102,6 +104,10 @@ buildDotnetModule (finalAttrs: {
     # Generate udev rules from source
     mkdir -p $out/lib/udev/rules.d
     ./generate-rules.sh > $out/lib/udev/rules.d/70-opentabletdriver.rules
+
+    wrapProgram $out/bin/otd-gui \
+      "''${gappsWrapperArgs[@]}" \
+      --add-flags --skipupdate
   '';
 
   desktopItems = [

pkgs/by-name/pa/parallel/package.nix

@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "parallel";
-  version = "20260322";
+  version = "20260422";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/parallel-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-dkaA6TL00NIc8DKb2fnu1lmJXeFoNgAfZJFTO4Ir7+A=";
+    hash = "sha256-ZkzxZdZuohey9JzZanhl7PkMnQYWWZzCq6jK1IHZB7s=";
   };
 
   outputs = [
@@ -56,6 +56,13 @@ stdenv.mkDerivation (finalAttrs: {
       }"
   '';
 
+  # Force run `check` instead of the `tests` target, because the `test` target depends on a private testsuite.
+  # The reason `check` isn't used by default is due to it failing when selecting the target to run. (due to stdenv not overriding the Makefiles SHELL variable from `/bin/bash`).
+  #
+  # See:
+  #   https://github.com/NixOS/nixpkgs/blob/ef4f672aa2be8b268a4280e8e2a68cd97a4cf67b/pkgs/stdenv/generic/setup.sh#L1541
+  #   https://github.com/NixOS/nixpkgs/blob/ef4f672aa2be8b268a4280e8e2a68cd97a4cf67b/pkgs/stdenv/generic/setup.sh#L1555
+  checkTarget = "check";
   doCheck = true;
 
   meta = {

pkgs/by-name/pw/pwgen/package.nix

@@ -20,6 +20,8 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
   ];
 
+  configureFlags = [ "CFLAGS=-std=gnu17" ];
+
   meta = {
     description = "Password generator which creates passwords which can be easily memorized by a human";
     homepage = "https://github.com/tytso/pwgen";

pkgs/by-name/re/readeck/package.nix

@@ -6,17 +6,18 @@
   nodejs_22,
   npmHooks,
   python3,
+  nix-update-script,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "readeck";
-  version = "0.21.5";
+  version = "0.22.2";
 
   src = fetchFromCodeberg {
     owner = "readeck";
     repo = "readeck";
     tag = finalAttrs.version;
-    hash = "sha256-9M9Bgl1CJ35x/Onlk5xUNCFkZKW40efF6qMOM+2/HR0=";
+    hash = "sha256-0arC5t7FlW5+AyGF9FuIPc+aeF+CMKIzO1vLJ7aisQE=";
   };
 
   nativeBuildInputs = [
@@ -61,10 +62,12 @@ buildGoModule (finalAttrs: {
 
   npmDeps = fetchNpmDeps {
     src = "${finalAttrs.src}/web";
-    hash = "sha256-znUKRaUdx6GXD2YL6hs0iveaAAHQ8H9n4NHZFi331+g=";
+    hash = "sha256-80mh7fATUKf9G/JGsfHYHOLjr/je7g0uRdRGqBWapnY=";
   };
 
-  vendorHash = "sha256-2MB7v5oG/LcEKtgbFNxPXSI8TljpbqYUrI7pvu7m+e8=";
+  vendorHash = "sha256-4cLv7eYNzj+YzrinbEg7tT+JkEen+C5ypg3NTQOB6FM=";
+
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Web application that lets you save the readable content of web pages you want to keep forever";

pkgs/by-name/rs/rspamd/package.nix

@@ -2,55 +2,59 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  nixosTests,
+
+  # build
   cmake,
-  # doctest,
-  fmt,
-  perl,
   glib,
+  perl,
+  pkg-config,
+
+  # runtime
+  blas,
+  fmt,
+  icu,
+  jemalloc,
+  lapack,
+  libarchive,
+  libsodium,
+  lua,
   luajit,
   openssl,
   pcre,
-  pkg-config,
-  sqlite,
   ragel,
-  fasttext,
-  icu,
-  hyperscan,
+  sqlite,
   vectorscan,
-  jemalloc,
-  blas,
-  lapack,
-  lua,
-  libsodium,
   xxhash,
   zstd,
-  libarchive,
-  # Enabling blas support breaks bayes filter training from dovecot in nixos-mailserver tests
+
+  # flags
   # https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/issues/321
+  # Enabling blas support breaks Bayes filter training from within Sieve pipe in Dovecot
   withBlas ? false,
-  withHyperscan ? false,
-  withLuaJIT ? stdenv.hostPlatform.isx86_64,
-  withVectorscan ? true,
-  nixosTests,
+  withLuaJIT ? true,
 }:
 
-assert withHyperscan -> stdenv.hostPlatform.isx86_64;
-assert (!withHyperscan) || (!withVectorscan);
+let
+  inherit (lib)
+    cmakeFeature
+    ;
+
+  # rspamd doesn't consistently accept bools
+  cmakeBool' = feature: condition: cmakeFeature feature (if condition then "ON" else "OFF");
+in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rspamd";
-  version = "3.14.3";
+  version = "4.0.1";
 
   src = fetchFromGitHub {
     owner = "rspamd";
     repo = "rspamd";
     tag = finalAttrs.version;
-    hash = "sha256-ntWBcwcPZwRRSTUO4a0JUNd6kc49fm+0/x+fqcZIA/o=";
+    hash = "sha256-8hpplpo57DnOUT1T8jcfGRyIoWySfqrOFrMgH1tept8=";
   };
 
-  patches = [
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -59,52 +63,49 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    # doctest
     fmt
     glib
-    openssl
-    pcre
-    sqlite
-    ragel
-    fasttext
     icu
     jemalloc
+    libarchive
     libsodium
+    (if withLuaJIT then luajit else lua)
+    openssl
+    pcre
+    ragel
+    sqlite
+    vectorscan
     xxhash
     zstd
-    libarchive
   ]
   ++ lib.optionals withBlas [
     blas
     lapack
-  ]
-  ++ lib.optional withHyperscan hyperscan
-  ++ lib.optional withLuaJIT luajit
-  ++ lib.optional (!withLuaJIT) lua
-  ++ lib.optional withVectorscan vectorscan;
+  ];
 
   cmakeFlags = [
+    (cmakeFeature "RUNDIR" "/run/rspamd")
+    (cmakeFeature "DBDIR" "/var/lib/rspamd")
+    (cmakeFeature "LOGDIR" "/var/log/rspamd")
+    (cmakeFeature "LOCAL_CONFDIR" "/etc/rspamd")
+    (cmakeBool' "ENABLE_BLAS" withBlas)
+    (cmakeBool' "ENABLE_HYPERSCAN" true)
+    (cmakeBool' "ENABLE_JEMALLOC" true)
+    (cmakeBool' "ENABLE_LUAJIT" withLuaJIT)
     # pcre2 jit seems to cause crashes: https://github.com/NixOS/nixpkgs/pull/181908
-    "-DENABLE_PCRE2=OFF"
-    "-DDEBIAN_BUILD=ON"
-    "-DRUNDIR=/run/rspamd"
-    "-DDBDIR=/var/lib/rspamd"
-    "-DLOGDIR=/var/log/rspamd"
-    "-DLOCAL_CONFDIR=/etc/rspamd"
-    "-DENABLE_BLAS=${if withBlas then "ON" else "OFF"}"
-    "-DENABLE_FASTTEXT=ON"
-    "-DENABLE_JEMALLOC=ON"
-    "-DSYSTEM_DOCTEST=OFF" # https://github.com/rspamd/rspamd/issues/5994
-    "-DSYSTEM_FMT=ON"
-    "-DSYSTEM_XXHASH=ON"
-    "-DSYSTEM_ZSTD=ON"
-    "-DENABLE_HYPERSCAN=ON"
-  ]
-  ++ lib.optional (!withLuaJIT) "-DENABLE_LUAJIT=OFF";
+    (cmakeBool' "ENABLE_PCRE2" false)
+    # doctest 2.5.0 compat problems https://github.com/rspamd/rspamd/issues/5994
+    (cmakeBool' "SYSTEM_DOCTEST" false)
+    (cmakeBool' "SYSTEM_XXHASH" true)
+    (cmakeBool' "SYSTEM_ZSTD" true)
+  ];
 
-  passthru.tests.rspamd = nixosTests.rspamd;
+  __structuredAttrs = true;
+
+  passthru.tests = nixosTests.rspamd;
 
   meta = {
+    changelog = "https://github.com/rspamd/rspamd/releases/tag/${finalAttrs.src.tag}";
     homepage = "https://rspamd.com";
     license = lib.licenses.asl20;
     description = "Advanced spam filtering system";

pkgs/by-name/sc/scrutiny-collector/package.nix

@@ -7,23 +7,21 @@
   lib,
   nix-update-script,
 }:
-let
-  version = "0.9.0";
-in
-buildGoModule rec {
-  inherit version;
+
+buildGoModule (finalAttrs: {
+  version = "0.9.1";
   pname = "scrutiny-collector";
 
   src = fetchFromGitHub {
     owner = "AnalogJ";
     repo = "scrutiny";
-    tag = "v${version}";
-    hash = "sha256-N6CYVhdA0BWewGUxyHtkW1ZFDGBYI7QfUo5er7xRcFw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-xEMHkISPBHinT6vRyrWPudvmTiX5gYxMkCEoSm2gLWA=";
   };
 
   subPackages = "collector/cmd/collector-metrics";
 
-  vendorHash = "sha256-fyHWy1TwwzFMIFzwilu4osfl/iI+2KqI6Bjr1UYUS68=";
+  vendorHash = "sha256-Em8k2AFoZv4TD4HFkkNIdyPj7IBOFiUIKffkifWfZFY=";
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -48,6 +46,7 @@ buildGoModule rec {
   meta = {
     description = "Hard disk metrics collector for Scrutiny";
     homepage = "https://github.com/AnalogJ/scrutiny";
+    changelog = "https://github.com/AnalogJ/scrutiny/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       samasaur
@@ -55,4 +54,4 @@ buildGoModule rec {
     ];
     mainProgram = "scrutiny-collector-metrics";
   };
-}
+})

pkgs/by-name/sc/scrutiny/package.nix

@@ -7,46 +7,46 @@
   nix-update-script,
 }:
 let
+  frontend =
+    finalAttrs:
+    buildNpmPackage {
+      inherit (finalAttrs) version;
+      pname = "${finalAttrs.pname}-webapp";
+      src = "${finalAttrs.src}/webapp/frontend";
+
+      npmDepsHash = "sha256-1lOskHEU/3CmhQkUkQExryK6eMOSWvMI+Y+cX4Dlj98=";
+
+      buildPhase = ''
+        runHook preBuild
+        mkdir dist
+        npm run build:prod --offline -- --output-path=dist
+        runHook postBuild
+      '';
+
+      installPhase = ''
+        runHook preInstall
+        mkdir $out
+        cp -r dist/* $out
+        runHook postInstall
+      '';
+
+      passthru.updateScript = nix-update-script { };
+    };
+in
+buildGoModule (finalAttrs: {
   pname = "scrutiny";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "AnalogJ";
     repo = "scrutiny";
-    tag = "v${version}";
-    hash = "sha256-N6CYVhdA0BWewGUxyHtkW1ZFDGBYI7QfUo5er7xRcFw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-xEMHkISPBHinT6vRyrWPudvmTiX5gYxMkCEoSm2gLWA=";
   };
 
-  frontend = buildNpmPackage {
-    inherit version;
-    pname = "${pname}-webapp";
-    src = "${src}/webapp/frontend";
-
-    npmDepsHash = "sha256-1lOskHEU/3CmhQkUkQExryK6eMOSWvMI+Y+cX4Dlj98=";
-
-    buildPhase = ''
-      runHook preBuild
-      mkdir dist
-      npm run build:prod --offline -- --output-path=dist
-      runHook postBuild
-    '';
-
-    installPhase = ''
-      runHook preInstall
-      mkdir $out
-      cp -r dist/* $out
-      runHook postInstall
-    '';
-
-    passthru.updateScript = nix-update-script { };
-  };
-in
-buildGoModule rec {
-  inherit pname src version;
-
   subPackages = "webapp/backend/cmd/scrutiny";
 
-  vendorHash = "sha256-fyHWy1TwwzFMIFzwilu4osfl/iI+2KqI6Bjr1UYUS68=";
+  vendorHash = "sha256-Em8k2AFoZv4TD4HFkkNIdyPj7IBOFiUIKffkifWfZFY=";
 
   env.CGO_ENABLED = 0;
 
@@ -56,7 +56,7 @@ buildGoModule rec {
 
   postInstall = ''
     mkdir -p $out/share/scrutiny
-    cp -r ${frontend}/* $out/share/scrutiny
+    cp -r ${frontend finalAttrs}/* $out/share/scrutiny
   '';
 
   passthru.tests.scrutiny = nixosTests.scrutiny;
@@ -65,7 +65,7 @@ buildGoModule rec {
   meta = {
     description = "Hard Drive S.M.A.R.T Monitoring, Historical Trends & Real World Failure Thresholds";
     homepage = "https://github.com/AnalogJ/scrutiny";
-    changelog = "https://github.com/AnalogJ/scrutiny/releases/tag/v${version}";
+    changelog = "https://github.com/AnalogJ/scrutiny/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       samasaur
@@ -74,4 +74,4 @@ buildGoModule rec {
     mainProgram = "scrutiny";
     platforms = lib.platforms.linux;
   };
-}
+})

pkgs/by-name/si/siketyan-ghr/package.nix

@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ghr";
-  version = "0.4.4";
+  version = "0.4.5";
 
   src = fetchFromGitHub {
     owner = "siketyan";
     repo = "ghr";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-L9+rcdt+MGZSCOJyCE4t/TT6Fjtxvfr9LBJYyRrx208=";
+    hash = "sha256-8DnujtAtJiSnrC3k5vGRQuk6RfC5Vn+z4HAVsEnXN7c=";
   };
 
-  cargoHash = "sha256-xRa/brOYJ19J25wGdtNR2g+ouMyvz9YFXnzepeipWNQ=";
+  cargoHash = "sha256-8b9kAl9KoeWG+LEFkRQd6zbiWqyIybbcXpImz+akS7M=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/by-name/sm/smfh/package.nix

@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "smfh";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "feel-co";
     repo = "smfh";
     tag = finalAttrs.version;
-    hash = "sha256-6zMgOPzBbTSm8jzPqmGcotjvkN3HzxcnMM8pW64JpZQ=";
+    hash = "sha256-RgszLC/p9uov6aXnPGbFRkPzT5xleX17wBCdoMT1wcA=";
   };
 
-  cargoHash = "sha256-FVTpH+scBCjgm3sf9sowRCI/X2jCS1wHtLLiOyKAD8U=";
+  cargoHash = "sha256-7IcoDgRvpye2lm+bdPlVKj0GO6QBABiQKVwSxL4Mh5k=";
 
   meta = {
     description = "Sleek Manifest File Handler";

pkgs/by-name/sm/smithy-cli/package.nix

@@ -0,0 +1,115 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gradle,
+  jdk,
+  jre,
+  makeWrapper,
+  testers,
+  runCommand,
+  writeText,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "smithy-cli";
+  version = "1.68.0";
+
+  src = fetchFromGitHub {
+    owner = "smithy-lang";
+    repo = "smithy";
+    tag = finalAttrs.version;
+    hash = "sha256-jME/yF6i+hQFMr8lseRKS8uSv0s6HNWqBfsRuSSzonI=";
+  };
+
+  nativeBuildInputs = [
+    gradle
+    jdk
+    makeWrapper
+  ];
+
+  # Required on Darwin to avoid SocketException during Gradle operations
+  __darwinAllowLocalNetworking = true;
+
+  mitmCache = gradle.fetchDeps {
+    inherit (finalAttrs) pname;
+    data = ./deps.json;
+  };
+
+  # Only build the shadowJar for smithy-cli, skip native image tasks that
+  # would try to download Amazon Corretto
+  gradleBuildTask = ":smithy-cli:shadowJar";
+
+  # Fetch both compile and test dependencies during update
+  gradleUpdateTask = ":smithy-cli:shadowJar :smithy-cli:test";
+
+  doCheck = true;
+  gradleCheckTask = ":smithy-cli:test";
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/smithy-cli/lib $out/bin
+
+    # Install the shadow JAR and the Smithy dependency JARs that it
+    # deliberately excludes (they are expected on the classpath separately)
+    cp smithy-cli/build/libs/smithy-cli-${finalAttrs.version}.jar $out/share/smithy-cli/lib/
+    for proj in smithy-utils smithy-model smithy-build smithy-diff; do
+      cp $proj/build/libs/$proj-${finalAttrs.version}.jar $out/share/smithy-cli/lib/
+    done
+    # smithy-syntax uses the shadow plugin too, so its JAR has no classifier
+    cp smithy-syntax/build/libs/smithy-syntax-${finalAttrs.version}.jar $out/share/smithy-cli/lib/
+
+    # Create wrapper that puts all JARs on the classpath.
+    # Java's -cp wildcard syntax requires a literal '*' (not shell-expanded),
+    # so we construct the classpath explicitly.
+    classpath=$(find $out/share/smithy-cli/lib -name '*.jar' | tr '\n' ':' | sed 's/:$//')
+    makeWrapper ${lib.getExe jre} $out/bin/smithy \
+      --add-flags "-cp $classpath software.amazon.smithy.cli.SmithyCli"
+
+    runHook postInstall
+  '';
+
+  passthru.tests = {
+    version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+    };
+    validate = runCommand "smithy-cli-validate-test" { } ''
+      ${lib.getExe finalAttrs.finalPackage} validate ${writeText "example.smithy" ''
+        $version: "2.0"
+        namespace example
+        service ExampleService {
+            version: "2023-01-01"
+            operations: [GetUser]
+        }
+        operation GetUser {
+            input: GetUserInput
+            output: GetUserOutput
+        }
+        structure GetUserInput {
+            @required
+            userId: String
+        }
+        structure GetUserOutput {
+            @required
+            name: String
+        }
+      ''}
+      touch $out
+    '';
+  };
+
+  meta = {
+    description = "CLI for the Smithy interface definition language (IDL)";
+    homepage = "https://smithy.io/";
+    changelog = "https://github.com/smithy-lang/smithy/releases/tag/${finalAttrs.version}";
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryBytecode # deps
+    ];
+    license = lib.licenses.asl20;
+    mainProgram = "smithy";
+    maintainers = [ lib.maintainers.joshgodsiff ];
+    platforms = lib.platforms.unix;
+  };
+})

pkgs/by-name/sm/smpmgr/package.nix

@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "smpmgr";
-  version = "0.17.0";
+  version = "0.18.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "intercreate";
     repo = "smpmgr";
     tag = finalAttrs.version;
-    hash = "sha256-EWvTt0bfkHA+E9nkoI8u17j6zevbDofGUxHpFXoUGyo=";
+    hash = "sha256-wH9WdZXN1sR+uEOo/LupaIqYVzuHHyOX1EimD7MVNFw=";
   };
 
   build-system = with python3Packages; [

pkgs/by-name/sr/srm/package.nix

@@ -17,6 +17,7 @@ stdenv.mkDerivation {
 
   patches = [ ./fix-output-in-verbose-mode.patch ];
   nativeBuildInputs = [ autoreconfHook ];
+  configureFlags = [ "CFLAGS=-std=gnu17" ];
 
   meta = {
     description = "Delete files securely";

pkgs/by-name/wi/wiki-go/package.nix

@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "wiki-go";
-  version = "1.8.7";
+  version = "1.8.8";
 
   src = fetchFromGitHub {
     owner = "leomoon-studios";
     repo = "wiki-go";
     tag = "v${version}";
-    hash = "sha256-5Swnr/V/lfXxF1tGhmq2mo+ZDmob9nLOS5pAYY58G/E=";
+    hash = "sha256-zFmyDupVOgj/oOAq8f2iG2glovWjaRy32GCh7u+Rjg8=";
   };
 
   vendorHash = null;

pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix

@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
   cmake,
   dbus,
@@ -15,24 +14,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-notifications";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-notifications";
     tag = finalAttrs.version;
-    hash = "sha256-d3fJiYGAYF5e6XPuZ26Lrjj8tUiquunMLDLs9PdAYcA=";
+    hash = "sha256-rGs+MTt/Z+Gk3jSxU7tfNAUdypG/HJ4pDqvC+U722Eg=";
   };
 
-  patches = [
-    # Remove when version > 1.3.1
-    (fetchpatch {
-      name = "0001-lomiri-notifications-Properly-include-lomiri-shell-api-includedirs.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-notifications/-/commit/b68e51db6df1ed2637692dbff704374ab4c53fa7.patch";
-      hash = "sha256-GWGlKQgOEy7HgzgA6H2Dmp0tB5amVcb3lj4LDT9dJCE=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace CMakeLists.txt \
       --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"

pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix

@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitLab,
+  fetchpatch,
   gitUpdater,
   replaceVars,
   testers,
@@ -74,13 +75,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-ui-toolkit";
-  version = "1.3.5904";
+  version = "1.3.5905";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-ui-toolkit";
     rev = finalAttrs.version;
-    hash = "sha256-lrytLk7+RpD3V4g9m7JruqOfLggJO9sGLzt5UrGbs/Q=";
+    hash = "sha256-59Q7Atxt6CfR0LgNa6keGDY+HpV/eOdTngVHcUJEesg=";
   };
 
   outputs = [
@@ -92,6 +93,13 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   patches = [
+    # Remove when version > 1.3.5905
+    (fetchpatch {
+      name = "0001-lomiri-ui-toolkit-Fix-compatibility-with-Qt-6.11.patch";
+      url = "https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/commit/57303d2b01549ef78b029ed05babbc9400e102f3.patch";
+      hash = "sha256-22QSOaYZ+hsctLt8+ffrzBIY3btp+rM6NBsu0gvQMeM=";
+    })
+
     ./2001-Mark-problematic-tests.patch
 
     (replaceVars ./2002-Nixpkgs-versioned-QML-path.patch.in {
@@ -101,70 +109,70 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     patchShebangs documentation/docs.sh tests/
-
-    # Reverse dependencies (and their reverse dependencies too) access the function patched here to register their gettext catalogues,
-    # so hardcoding any prefix here will make only catalogues in that prefix work. APP_DIR envvar will override this, but with domains from multiple derivations being
-    # used in a single application (lomiri-system-settings), that's of not much use either.
-    # https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/blob/dcb3a523c56a400e5c3c163c2836cafca168767e/src/LomiriToolkit/i18n.cpp#L101-129
-    #
-    # This could be solved with a reference to the prefix of whoever requests the domain, but the call happens via some automatic Qt / QML callback magic,
-    # I'm not sure what the best way of injecting that there would be.
-    # https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/blob/dcb3a523c56a400e5c3c163c2836cafca168767e/src/LomiriToolkit/i18n_p.h#L34
-    #
-    # Using /run/current-system/sw/share/locale instead of /usr/share/locale isn't a great
-    # solution, but at least it should get us working localisations
+  ''
+  # Reverse dependencies (and their reverse dependencies too) access the function patched here to register their gettext catalogues,
+  # so hardcoding any prefix here will make only catalogues in that prefix work. APP_DIR envvar will override this, but with domains from multiple derivations being
+  # used in a single application (lomiri-system-settings), that's of not much use either.
+  # https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/blob/dcb3a523c56a400e5c3c163c2836cafca168767e/src/LomiriToolkit/i18n.cpp#L101-129
+  #
+  # This could be solved with a reference to the prefix of whoever requests the domain, but the call happens via some automatic Qt / QML callback magic,
+  # I'm not sure what the best way of injecting that there would be.
+  # https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/blob/dcb3a523c56a400e5c3c163c2836cafca168767e/src/LomiriToolkit/i18n_p.h#L34
+  #
+  # Using /run/current-system/sw/share/locale instead of /usr/share/locale isn't a great
+  # solution, but at least it should get us working localisations
+  + ''
     substituteInPlace src/LomiriToolkit/i18n.cpp \
       --replace-fail "/usr" "/run/current-system/sw"
-
-    # The code here overrides the regular QML import variables so the just-built modules are found & used in the tests
-    # But we need their QML dependencies too, so put them back in there
+  ''
+  # The code here overrides the regular QML import variables so the just-built modules are found & used in the tests
+  # But we need their QML dependencies too, so put them back in there
+  + ''
     substituteInPlace export_qml_dir.sh \
       --replace-fail '_IMPORT_PATH=$BUILD_DIR/qml' '_IMPORT_PATH=$BUILD_DIR/qml:${qtQmlPaths}'
-
-    # These tests try to load Suru theme icons, but override XDG_DATA_DIRS / use full paths to load them
+  ''
+  # These tests try to load Suru theme icons, but override XDG_DATA_DIRS / use full paths to load them
+  + ''
     substituteInPlace \
       tests/unit/visual/tst_visual.cpp \
-      tests/unit/visual/tst_icon.{11,13}.qml \
-      tests/unit/visual/tst_imageprovider.11.qml \
+      tests/unit/visual/tst_icon.qml \
+      tests/unit/visual13/tst_icon.{11,13}.qml \
+      tests/unit/visual/tst_imageprovider.qml \
+      tests/unit/visual13/tst_imageprovider.11.qml \
       --replace-fail '/usr/share' '${suru-icon-theme}/share'
   ''
-  # Adjust to Qt 6.11, TODO report & submit upstream
-  + lib.optionalString withQt6 ''
-    substituteInPlace apicheck/apicheck.cpp \
-      --replace-fail \
-        'attachedPropertiesType(QQmlEnginePrivate::get(currentEngine))' \
-        'attachedPropertiesType(QQmlTypeLoader::get(currentEngine))'
-
-    substituteInPlace src/LomiriToolkit/ucstylehints.cpp \
-      --replace-fail \
-        'QQmlEnginePrivate::getV4Engine(qmlEngine(this))' \
-        'qmlEngine(this)->handle()'
-  ''
-  + lib.optionalString (!withQt6) ''
-    for subproject in po app-launch-profiler lomiri-ui-toolkit-launcher; do
-      substituteInPlace $subproject/$subproject.pro \
-        --replace-fail '$$[QT_INSTALL_PREFIX]' "$out"
-    done
-
+  + lib.optionalString (!withQt6) (
+    ''
+      for subproject in po app-launch-profiler lomiri-ui-toolkit-launcher; do
+        substituteInPlace $subproject/$subproject.pro \
+          --replace-fail "\''$\''$[QT_INSTALL_PREFIX]" "$out"
+      done
+    ''
     # Install apicheck tool into bin
-    substituteInPlace apicheck/apicheck.pro \
-      --replace-fail '$$[QT_INSTALL_LIBS]/lomiri-ui-toolkit' "$out/bin"
-
-    substituteInPlace \
-      src/LomiriMetrics/LomiriMetrics.pro \
-      src/LomiriMetrics/lttng/lttng.pro \
-      --replace-fail '$$[QT_INSTALL_PLUGINS]' "$out/${qtbase.qtPluginPrefix}"
-
-    substituteInPlace features/lomiri_qml_plugin.prf \
-      --replace-fail '$$[QT_INSTALL_QML]' "$out/${qtbase.qtQmlPrefix}"
-
-    substituteInPlace documentation/documentation.pro \
-      --replace-fail '/usr/share/doc' '$$PREFIX/share/doc' \
-      --replace-fail '$$[QT_INSTALL_DOCS]' '$$PREFIX/share/doc/lomiri-ui-toolkit'
-
+    + ''
+      substituteInPlace apicheck/apicheck.pro \
+        --replace-fail "\''$\''$[QT_INSTALL_LIBS]/lomiri-ui-toolkit" "$out/bin"
+    ''
+    + ''
+      substituteInPlace \
+        src/LomiriMetrics/LomiriMetrics.pro \
+        src/LomiriMetrics/lttng/lttng.pro \
+        --replace-fail '$$[QT_INSTALL_PLUGINS]' "$out/${qtbase.qtPluginPrefix}"
+    ''
+    + ''
+      substituteInPlace features/lomiri_qml_plugin.prf \
+        --replace-fail '$$[QT_INSTALL_QML]' "$out/${qtbase.qtQmlPrefix}"
+    ''
+    + ''
+      substituteInPlace documentation/documentation.pro \
+        --replace-fail '/usr/share/doc' '$$PREFIX/share/doc' \
+        --replace-fail '$$[QT_INSTALL_DOCS]' '$$PREFIX/share/doc/lomiri-ui-toolkit'
+    ''
     # Causes redefinition error with our own fortify hardening
-    sed -i '/DEFINES += _FORTIFY_SOURCE/d' features/lomiri_common.prf
-  ''
+    + ''
+      sed -i '/DEFINES += _FORTIFY_SOURCE/d' features/lomiri_common.prf
+    ''
+  )
   + lib.optionalString withQt6 ''
     substituteInPlace CMakeLists.txt \
       --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" \

pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix

@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
   testers,
   boost,
@@ -33,13 +32,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-download-manager";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-download-manager";
     tag = finalAttrs.version;
-    hash = "sha256-/rb1Fx0TbBuff2dWAgxpd72opTnLe0itcGwLJ53Wu9U=";
+    hash = "sha256-FqpTEGbSwN+2oG/G2Zf80rSfezJP/ogtIkVdIrX4FMU=";
   };
 
   outputs = [
@@ -48,15 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals withDocumentation [ "doc" ];
 
-  patches = [
-    # Remove when version > 0.3.0
-    (fetchpatch {
-      name = "0001-lomiri-download-manager-Properly-include-lomiri-api-includedirs.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/commit/b847aca92cea6f729b96f7a55f765ae4d9fbf741.patch";
-      hash = "sha256-hx/b80P5nbonlP3B8ekjZjxUGV3Ofm/lai0RU1ak9Gs=";
-    })
-  ];
-
   postPatch = ''
     # Substitute systemd's prefix in pkg-config call
     substituteInPlace CMakeLists.txt \

pkgs/development/libraries/qt-5/5.15/default.nix

@@ -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 { };

pkgs/development/libraries/qt-5/5.15/qtwebkit-cstdint.patch

@@ -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
- {

pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-qos-classes.patch

@@ -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)

pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch

@@ -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)

pkgs/development/libraries/qt-5/5.15/qtwebkit-icu68.patch

@@ -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)

pkgs/development/libraries/qt-5/5.15/qtwebkit.patch

@@ -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}
-

pkgs/development/libraries/qt-5/5.15/srcs.nix

@@ -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";

pkgs/development/libraries/qt-5/modules/qtwebkit.nix

@@ -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/"
-    ];
-  };
-}

pkgs/development/libraries/qtwebkit-plugins/default.nix

@@ -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 = [ ];
-  };
-}

pkgs/development/lua-modules/generated-packages.nix

@@ -95,18 +95,18 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "argparse";
-      version = "0.7.1-1";
+      version = "0.7.2-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/argparse-0.7.1-1.rockspec";
-          sha256 = "116iaczq6glzzin6qqa2zn7i22hdyzzsq6mzjiqnz6x1qmi0hig8";
+          url = "mirror://luarocks/argparse-0.7.2-1.rockspec";
+          sha256 = "1az7ikzll699sbz2qxq9wkm0ncmic33dhg85zqlznbnz28vy6jza";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/luarocks/argparse/archive/0.7.1.zip";
-        sha256 = "0idg79d0dfis4qhbkbjlmddq87np75hb2vj41i6prjpvqacvg5v1";
+        url = "https://github.com/luarocks/argparse/archive/0.7.2.zip";
+        sha256 = "0ji3hh0s2g2i5sribiib2vpy30xzfkv61m4mzwawfpgraqg03r6y";
       };
 
-      disabled = luaOlder "5.1" || luaAtLeast "5.5";
+      disabled = luaOlder "5.1" || luaAtLeast "5.6";
 
       meta = {
         homepage = "https://github.com/luarocks/argparse";
@@ -1008,15 +1008,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "fzf-lua";
-      version = "0.0.2615-1";
+      version = "0.0.2629-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/fzf-lua-0.0.2615-1.rockspec";
-          sha256 = "04y7lh9mm7lj605xpsrb6p142mpmnnisf781slfmcsgl2zbm4pk9";
+          url = "mirror://luarocks/fzf-lua-0.0.2629-1.rockspec";
+          sha256 = "0n4p78119nir3cbb5ig313nf2mlnzf16kxkbwy1xc7lnhy9czv4q";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/ibhagwan/fzf-lua/archive/cebf88881a4fab2c20a2a950269953417af1c3e8.zip";
-        sha256 = "13b4zrx4j2pnl9sh6mcyx120gm29flk7zr03vkik2difpcpdi518";
+        url = "https://github.com/ibhagwan/fzf-lua/archive/1ae863c83e0823225b4e041845f10c918d5fb882.zip";
+        sha256 = "0hsxklwq6kqvjcpdlwilqk7wmw0pdah5g8skg1iya97fj13imnc6";
       };
 
       disabled = luaOlder "5.1";
@@ -3857,17 +3857,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "luasystem";
-      version = "0.7.0-1";
+      version = "0.7.1-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/luasystem-0.7.0-1.rockspec";
-          sha256 = "1c50g495s2xzf041p9yl58idxa1mv28sxbgymy05jyp30g0ifqw5";
+          url = "mirror://luarocks/luasystem-0.7.1-1.rockspec";
+          sha256 = "10hnakzkyjqh6plks2wz2844l7rw619vfc5b3idqw9pndpw6fylz";
         }).outPath;
       src = fetchFromGitHub {
         owner = "lunarmodules";
         repo = "luasystem";
-        tag = "v0.7.0";
-        hash = "sha256-/hob/bDP3CQeMZuz29a4XTRzlU7I7O2W/EszJEueq8c=";
+        tag = "v0.7.1";
+        hash = "sha256-HxOtwWyAYOxTQXm0KyJVvSNTxWOJnn4pnX0FFu4HYh4=";
       };
 
       disabled = luaOlder "5.1";
@@ -5495,21 +5495,21 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "rustaceanvim";
-      version = "9.0.2-2";
+      version = "9.0.3-2";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/rustaceanvim-9.0.2-2.rockspec";
-          sha256 = "09vq53b68a9ywilb7fa1bsn52wmdzdvbflih0p8ppjzsk1lyilsv";
+          url = "mirror://luarocks/rustaceanvim-9.0.3-2.rockspec";
+          sha256 = "1afjl8f0qgqlingk8schjnpqi1ihh35s33pf57xpn6chx281zb7d";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v9.0.2.zip";
-        sha256 = "0kmd12d234fwrikhz33y7npdmyi7ahldb9mjdwlvl3kgq0lkpg74";
+        url = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v9.0.3.zip";
+        sha256 = "14573r04zqn72a6qjhnjii0n6n2s8smdg5rsccr1svy2aplvwxrj";
       };
 
       disabled = lua.luaversion != "5.1";
 
       meta = {
-        homepage = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v9.0.2.zip";
+        homepage = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v9.0.3.zip";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "GPL-2.0-only";
         description = "🦀 Supercharge your Rust experience in Neovim! A heavily modified fork of rust-tools.nvim";
@@ -5882,8 +5882,8 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "nvim-telescope";
         repo = "telescope.nvim";
-        rev = "028d9a0695a0cc4cfa893889f8c408ed7ccc8adc";
-        hash = "sha256-xU/lozREXuXkjBq8L94sLwyEE6f7k8Q3y0BkjPssB1Y=";
+        rev = "506338434fec5ad19cb1f8d45bf92d66c4917393";
+        hash = "sha256-ekfqqG44cS13FJ0qQKOCl8bftxF8BSRD5v+wZrCAvb8=";
       };
 
       disabled = lua.luaversion != "5.1";

pkgs/development/python-modules/atopile/default.nix

@@ -214,10 +214,13 @@ buildPythonPackage (finalAttrs: {
     "test_muster_specific_targets_with_dependencies"
   ];
 
-  # in order to use pytest marker, we need to use ppytestFlagsArray
-  # using pytestFlags causes `ERROR: file or directory not found: slow`
-  pytestFlagsArray = [
-    "-m='not slow and not not_in_ci and not regression'"
+  disabledTestMarks = [
+    "slow"
+    "not_in_ci"
+    "regression"
+  ];
+
+  pytestFlags = [
     "--timeout=10" # any test taking long, timouts with more than 60s
     "--benchmark-disable"
     "--tb=line"

pkgs/development/python-modules/bx-py-utils/default.nix

@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "bx-py-utils";
-  version = "116";
+  version = "118";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "boxine";
     repo = "bx_py_utils";
     tag = "v${version}";
-    hash = "sha256-wrPEwYeM4HjhgRO51XyPx6e/TsX52378bFhPw1NZreM=";
+    hash = "sha256-SasoLZ8Ay+aqBItT/O8RMGEbPXxXsL//ssvttMcnZnQ=";
   };
 
   postPatch = ''

pkgs/development/python-modules/crewai/default.nix

@@ -55,14 +55,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "crewai";
-  version = "1.14.1";
+  version = "1.14.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "crewAIInc";
     repo = "crewAI";
     tag = finalAttrs.version;
-    hash = "sha256-MwBcum9HX0emKPB0UpTCBTvZRnNP0YqU02YCEHZ4CeA=";
+    hash = "sha256-AMGAo2fllV4RasRXoeOpJii8aWfu7/JW1iXp3VgTGVo=";
   };
 
   postPatch = ''

pkgs/development/python-modules/dbt-snowflake/default.nix

@@ -36,9 +36,9 @@ buildPythonPackage rec {
 
   enabledTestPaths = [ "tests/unit" ];
 
-  pytestFlagsArray = [
+  pytestFlags = [
     # pyproject.toml specifies -n auto which only pytest-xdist understands
-    "--override-ini addopts=''"
+    "--override-ini=addopts="
   ];
 
   pythonImportsCheck = [ "dbt.adapters.snowflake" ];

pkgs/development/python-modules/dm-control/default.nix

@@ -29,14 +29,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "dm-control";
-  version = "1.0.39";
+  version = "1.0.40";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "google-deepmind";
     repo = "dm_control";
     tag = finalAttrs.version;
-    hash = "sha256-N5/zFIJIj0T0TxATeExbcSuAy/kNotY5odSiJuehZ7Y=";
+    hash = "sha256-93ALiUTTp7IJsgA09DnS26+a6Sn40s91mNCIU5CbEG8=";
   };
 
   build-system = [

pkgs/development/python-modules/farama-notifications/default.nix

@@ -5,27 +5,28 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "farama-notifications";
-  version = "0.0.4";
+  version = "0.0.6";
+  pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "Farama-Foundation";
     repo = "farama-notifications";
-    rev = version;
-    hash = "sha256-UUrJ/5t5x54xs1gweNUhwqrMJQXiyrUPn1bBfTsiPcw=";
+    tag = finalAttrs.version;
+    hash = "sha256-gvOLitPqpJW1kLVZUkf8UVhKdjhCZhu9ORmdLHzil1E=";
   };
 
-  pyproject = true;
-
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
   pythonImportsCheck = [ "farama_notifications" ];
 
   meta = {
     description = "Allows for providing notifications on import to all Farama Packages";
     homepage = "https://github.com/Farama-Foundation/Farama-Notifications";
+    changelog = "https://github.com/Farama-Foundation/Farama-Notifications/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };
-}
+})

pkgs/development/python-modules/fsspec-xrootd/default.nix

@@ -19,14 +19,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "fsspec-xrootd";
-  version = "0.5.3";
+  version = "0.5.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CoffeaTeam";
     repo = "fsspec-xrootd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-phtvWBKaBu6piVB226y9R29njI39z6vRLBbwlHZbpKk=";
+    hash = "sha256-dlSh2TH7SQ95kFNPlSjMa697WdBURRlBxNtNf04uaBU=";
   };
 
   build-system = [