cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #304082 from Artturin/qtwarningsthrow

Browse source 
qt: convert warnings to throw
This commit is contained in:
Artturi 2024-04-15 21:35:23 +03:00 committed by GitHub
commit c17c770c7a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -203,10 +203,8 @@ let
} ./hooks/qmake-hook.sh) } ./hooks/qmake-hook.sh)
{ }; { };
} // lib.optionalAttrs config.allowAliases { } // lib.optionalAttrs config.allowAliases {
# Convert to a throw on 03-01-2023 and backport the change. # Remove completely before 24.11
# Warnings show up in various cli tool outputs, throws do not. overrideScope' = builtins.throw "qt6 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\".";
# Remove completely before 24.05
overrideScope' = lib.warnIf (lib.isInOldestRelease 2311) "qt6 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope;
}; };
baseScope = makeScopeWithSplicing' { baseScope = makeScopeWithSplicing' {

6
pkgs/top-level/qt5-packages.nix
View file

@ -293,9 +293,7 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP
yuview = callPackage ../applications/video/yuview { }; yuview = callPackage ../applications/video/yuview { };
}) // lib.optionalAttrs pkgs.config.allowAliases { }) // lib.optionalAttrs pkgs.config.allowAliases {
# Convert to a throw on 01-01-2023. # Remove completely before 24.11
# Warnings show up in various cli tool outputs, throws do not. overrideScope' = builtins.throw "libsForQt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\".";
# Remove completely before 24.05
overrideScope' = lib.warn "libsForQt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope;
})); }));
} }

6
pkgs/top-level/qt6-packages.nix
View file

@ -115,9 +115,7 @@ makeScopeWithSplicing' {
wayqt = callPackage ../development/libraries/wayqt { }; wayqt = callPackage ../development/libraries/wayqt { };
} // lib.optionalAttrs pkgs.config.allowAliases { } // lib.optionalAttrs pkgs.config.allowAliases {
# Convert to a throw on 01-01-2023. # Remove completely before 24.11
# Warnings show up in various cli tool outputs, throws do not. overrideScope' = builtins.throw "qt6Packages now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\".";
# Remove completely before 24.05
overrideScope' = lib.warn "qt6Packages now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope;
}); });
} }