-
-
Notifications
You must be signed in to change notification settings - Fork 15.5k
Comparing changes
Open a pull request
base repository: NixOS/nixpkgs
base: 7a8d5dc8a676
head repository: NixOS/nixpkgs
compare: fe9f55907e2a
Commits on Oct 30, 2020
-
kdeApplications: Use latest qt515 by default
Fixes #100707 - Since KDE's maintainers don't allow non official kde applications under the `kdeApplications` path, many packages that depend on KDE libraries and applications are defined in all-packages.nix. Overriding all kdeApplications to use qt514 while all other `libsForQt5.callPackage` in all-packages.nix are using qt515, causes collisions.
Configuration menu - View commit details
-
Copy full SHA for c172f14 - Browse repository at this point
Copy the full SHA c172f14View commit details -
kpmcore: Use kio directly - from the scope of libsForQt5 used
Make sure only compatible qt versions are used for it (#101369) - kdeFrameworks is always using `libsForQt5` where e.g `libsForQt514.kpmcore` would have otherwise used a kio compiled with qt515.
Configuration menu - View commit details
-
Copy full SHA for d44460b - Browse repository at this point
Copy the full SHA d44460bView commit details -
all-packages.nix: Inherit kdesu in a different scope
Part of #101369: In order to avoid packages using the default `kdesu` always built with qt515, we put it in scope only for packages defined with a `libsForQt5`, to avoid incompatible qt versions used together in inputs of a package.
Configuration menu - View commit details
-
Copy full SHA for cb29abf - Browse repository at this point
Copy the full SHA cb29abfView commit details -
kf5gpgmepp: Define in libsForQt5
Since it's a qt library, we can't guarantee every package using it as a dependency will need it compiled with the same qt version, we put it in all `libsForQt5*` scopes (#101369).
Configuration menu - View commit details
-
Copy full SHA for 62318eb - Browse repository at this point
Copy the full SHA 62318ebView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2df5272 - Browse repository at this point
Copy the full SHA 2df5272View commit details -
treewide: Safer libsForQt5.callPackage
Intro: Part of #101369: Every attribute from kdeApplications and kdeFrameworks can be built with a few different qt5 versions. It's hard to tell the difference between an application and a library and some applications rely on inputs from kdeApplications and libsForQt5 alike. Before this change, some applications that were defined with `libsForQt5.callPackage` used libraries from the kde* sets compiled with a specific qt5 version, Due to `inherit (kde*) <lib or app>;` used in the widest scope, we had issues with packages that depended on packages defined by this `inherit`. This led to mismatched qt versions used in the same inputs, or the inputs of inputs etc. Hence, we added to all libsForQt5* sets, packages that will be used from the correct libsForQt5 set, in accordance to the `libsForQt5*.callPackage` used. All `inherit (kdeApplications) <pkgs>` and similar inheritance was moved out of all-packages.nix to aliases.nix only for backwards compatibility. Now some KDE applications show up in the attribute sets `libsForQt5*` which didn't show up there previously. This is sort of misleading, as these are not necessary libraries, but they show up in the wider scope thanks to them in aliases.nix. Hence it's the best that can be done considering the circumstances and the urgency of the issue.
Configuration menu - View commit details
-
Copy full SHA for b5c6505 - Browse repository at this point
Copy the full SHA b5c6505View commit details -
tellico: Use libkcddb from libsForQt5's scope.
Part of (#101369): kdeApplications points to a set of derivations built with a specific qt version, where libkcddb is available in libsForQt5's callPackage scope, thanks to the parent commit of this commit.
Configuration menu - View commit details
-
Copy full SHA for ea9de43 - Browse repository at this point
Copy the full SHA ea9de43View commit details -
maia-icon-theme: Don't import kdeApplications
Use libsForQt5.callPackage (#101369).
Configuration menu - View commit details
-
Copy full SHA for cf9f00b - Browse repository at this point
Copy the full SHA cf9f00bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2508fa5 - Browse repository at this point
Copy the full SHA 2508fa5View commit details -
firefox/wrapper: Use plasma-browser-integration correctly
Don't rely on the attribute from the aliases.nix, as ofborg checks that in PRs.
Configuration menu - View commit details
-
Copy full SHA for c8a7e4d - Browse repository at this point
Copy the full SHA c8a7e4dView commit details -
drumstick: Define in libsForQt5 scope.
Since it is used in minuet and kde's metronome and kmetronome, it's safer this way to make sure the same qt version is used there.
Configuration menu - View commit details
-
Copy full SHA for 3ce9e20 - Browse repository at this point
Copy the full SHA 3ce9e20View commit details -
packagekit-qt: Move to libsForQt5 scope.
Since it's a dependency of kde's "discover", it's best to define it there to avoid a possible mixed qt5 versions usage (#101369).
Configuration menu - View commit details
-
Copy full SHA for 9f9bdab - Browse repository at this point
Copy the full SHA 9f9bdabView commit details -
Configuration menu - View commit details
-
Copy full SHA for e681f44 - Browse repository at this point
Copy the full SHA e681f44View commit details -
Configuration menu - View commit details
-
Copy full SHA for 368302a - Browse repository at this point
Copy the full SHA 368302aView commit details -
Part of #101369: Inherit it in aliases.nix, for backwards compatibility.
Configuration menu - View commit details
-
Copy full SHA for a728279 - Browse repository at this point
Copy the full SHA a728279View commit details -
nixos/sddm: Use libsForQt514.sddm if needed (for lxqt)
Currently lxqt is a desktop environment that's compiled against qt514. To avoid possible issues (#101369), we (hopefully) use the same qt version as the desktop environment at hand. LXQT should move to qt515, and for the long term the correct qt version should be inherited by the sddm module.
Configuration menu - View commit details
-
Copy full SHA for 77e081b - Browse repository at this point
Copy the full SHA 77e081bView commit details -
kile: some slight improvements/fixes
Use `buildInputs` instead of `propagatedBuildInputs` - should reduce closure size a bit. Don't wrap executables twice. Move `kdoctools` to native. Use libsForQt5 - default version (works). Co-authored-by: Frederik Rietdijk <fridh@fridh.nl>
Configuration menu - View commit details
-
Copy full SHA for 09fd427 - Browse repository at this point
Copy the full SHA 09fd427View commit details -
Use fetchFromGitLab as it seems to be unavailable in the previous url.
Configuration menu - View commit details
-
Copy full SHA for 35078d9 - Browse repository at this point
Copy the full SHA 35078d9View commit details
Commits on Oct 31, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 2aaf963 - Browse repository at this point
Copy the full SHA 2aaf963View commit details
Commits on Nov 1, 2020
-
Merge pull request #102102 from rnhmjoj/cshatag
cshatag: init at 2019-12-03
Configuration menu - View commit details
-
Copy full SHA for 93e0a06 - Browse repository at this point
Copy the full SHA 93e0a06View commit details -
Merge pull request #101369 from doronbehar/pkg/kdeApplications/qt515
kdeApplications: Use latest qt515 by default
Configuration menu - View commit details
-
Copy full SHA for 54f7498 - Browse repository at this point
Copy the full SHA 54f7498View commit details -
Configuration menu - View commit details
-
Copy full SHA for fe9f559 - Browse repository at this point
Copy the full SHA fe9f559View commit details
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.