Unverified Commit c17c770c authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #304082 from Artturin/qtwarningsthrow 

qt: convert warnings to throw
parents fc69edcc 57834828

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

+2 −4
Original line number Diff line number Diff line
@@ -203,10 +203,8 @@ let 
          } ./hooks/qmake-hook.sh)

        { };

    } // lib.optionalAttrs config.allowAliases {

      # Convert to a throw on 03-01-2023 and backport the change.

      # Warnings show up in various cli tool outputs, throws do not.

      # Remove completely before 24.05

      overrideScope' = lib.warnIf (lib.isInOldestRelease 2311) "qt6 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope;

      # Remove completely before 24.11

      overrideScope' = builtins.throw "qt6 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\".";

    };



  baseScope = makeScopeWithSplicing' {

pkgs/top-level/qt5-packages.nix

+2 −4
Original line number Diff line number Diff line
@@ -293,9 +293,7 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP 


  yuview = callPackage ../applications/video/yuview { };

}) // lib.optionalAttrs pkgs.config.allowAliases {

  # Convert to a throw on 01-01-2023.

  # Warnings show up in various cli tool outputs, throws do not.

  # Remove completely before 24.05

  overrideScope' = lib.warn "libsForQt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope;

  # Remove completely before 24.11

  overrideScope' = builtins.throw "libsForQt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\".";

}));

}

pkgs/top-level/qt6-packages.nix

+2 −4
Original line number Diff line number Diff line
@@ -115,9 +115,7 @@ makeScopeWithSplicing' { 
  wayqt = callPackage ../development/libraries/wayqt { };



  } // lib.optionalAttrs pkgs.config.allowAliases {

    # Convert to a throw on 01-01-2023.

    # Warnings show up in various cli tool outputs, throws do not.

    # Remove completely before 24.05

    overrideScope' = lib.warn "qt6Packages now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope;

    # Remove completely before 24.11

    overrideScope' = builtins.throw "qt6Packages now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\".";

  });

}