Unverified Commit a64e80c7 authored by K900's avatar K900 Committed by GitHub
Browse files

qt6.full: drop (#454156)

parents b53675d6 f3d874fb

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

+2 −0
Original line number Diff line number Diff line
@@ -242,6 +242,8 @@ 


- `mariadb` now defaults to `mariadb_114` instead of `mariadb_1011`, meaning the default version was upgraded from 10.11.x to 11.4.x. See the [upgrade notes](https://mariadb.com/kb/en/upgrading-from-mariadb-10-11-to-mariadb-11-4/) for potential issues.



- `qt5.full` and `qt6.full` aliases have been removed. Their use has always been discouraged, and downstream projects should use `qtN.env` with the right set of packages.



- `python3Packages.duckduckgo-search` has been updated to v9+ and therefore has been renamed to ddgs.

  Use `python3Packages.ddgs` instead.

  See [release note for v9.0.0](https://github.com/deedy5/ddgs/releases/tag/v9.0.0)

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

+13 −4
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
  stdenv,

  fetchFromGitHub,

  cmake,

  qt6,

  kdePackages,

  wrapGAppsHook4,

}:
@@ -19,20 +20,28 @@ stdenv.mkDerivation rec { 
  };



  buildInputs = [

    kdePackages.qtwebengine

    kdePackages.qttools

    qt6.qtbase

    qt6.qtmultimedia

    qt6.qtwebengine

    qt6.qttools

    qt6.qt5compat

    kdePackages.mpvqt

    kdePackages.full

  ];

  nativeBuildInputs = [

    cmake

    wrapGAppsHook4

    kdePackages.wrapQtAppsHook

    qt6.wrapQtAppsHook

  ];

  cmakeFlags = with lib; [

    (cmakeFeature "CMAKE_BUILD_TYPE" "\"Release\"")

  ];



  dontWrapGApps = true;



  preFixup = ''

    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")

  '';



  meta = {

    description = "Simple RSS/Atom feed reader with online synchronization";

    mainProgram = "rssguard";

pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ in 
    ++ [

      qtwayland

      qtwebview

      (qt6.qtwebengine or qt6.full)

      qt6.qtwebengine

      rdma-core

    ]

    ++ lib.optionals (cudaOlder "12.7") [

pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix

+8 −8
Original line number Diff line number Diff line
@@ -87,14 +87,14 @@ in 
  buildInputs =

    prevAttrs.buildInputs or [ ]

    ++ [

      (qt6.qtdeclarative or qt6.full)

      (qt6.qtsvg or qt6.full)

      (qt6.qtimageformats or qt6.full)

      (qt6.qtpositioning or qt6.full)

      (qt6.qtscxml or qt6.full)

      (qt6.qttools or qt6.full)

      (qt6.qtwebengine or qt6.full)

      (qt6.qtwayland or qt6.full)

      qt6.qtdeclarative

      qt6.qtsvg

      qt6.qtimageformats

      qt6.qtpositioning

      qt6.qtscxml

      qt6.qttools

      qt6.qtwebengine

      qt6.qtwayland

      boost178

      cuda_cudart.stubs

      e2fsprogs

pkgs/development/libraries/qt-6/default.nix

+3 −52
Original line number Diff line number Diff line
@@ -67,58 +67,6 @@ let 
        inherit (srcs.qtbase) src version;

      };

      env = callPackage ./qt-env.nix { };

      full = callPackage (

        { env, qtbase }:

        env "qt-full-${qtbase.version}"

          # `with self` is ok to use here because having these spliced is unnecessary

          (

            with self;

            [

              qt3d

              qt5compat

              qtcharts

              qtconnectivity

              qtdatavis3d

              qtdeclarative

              qtdoc

              qtgraphs

              qtgrpc

              qthttpserver

              qtimageformats

              qtlanguageserver

              qtlocation

              qtlottie

              qtmultimedia

              qtmqtt

              qtnetworkauth

              qtpositioning

              qtsensors

              qtserialbus

              qtserialport

              qtshadertools

              qtspeech

              qtquick3d

              qtquick3dphysics

              qtquickeffectmaker

              qtquicktimeline

              qtremoteobjects

              qtsvg

              qtscxml

              qttools

              qttranslations

              qtvirtualkeyboard

              qtwebchannel

              qtwebengine

              qtwebsockets

              qtwebview

            ]

            ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [

              qtwayland

              libglvnd

            ]

          )

      ) { };



      qt3d = callPackage ./modules/qt3d.nix { };

      qt5compat = callPackage ./modules/qt5compat.nix { };

      qtcharts = callPackage ./modules/qtcharts.nix { };
@@ -213,6 +161,9 @@ let 
          };

        } ./hooks/qmake-hook.sh

      ) { };

    }

    // lib.optionalAttrs config.allowAliases {

      full = throw "qt6.full has been removed. Please use individual packages instead."; # Added 2025-10-21

    };



  baseScope = makeScopeWithSplicing' {