Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c0303c711046
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1593bd24235f
Choose a head ref
  • 4 commits
  • 59 files changed
  • 2 contributors

Commits on Jun 23, 2017

  1. plasma-workspace: no propagatedBuildInputs 

    Only libraries may have propagatedBuildInputs.
    @ttuegel
    ttuegel committed Jun 23, 2017
    Copy the full SHA
    0d1a1a4 View commit details

Commits on Jun 24, 2017

  1. qt5: 5.8.0 -> 5.9.0 

    Qt 5.8 is immediately removed because its support window is ended.

The qtlocation module is built with `enableParallelBuilding = false` so that the
clipper library will be built before the components which link to it.

kjs now depends directly on pcre. The dependency was previously propagated from
qtbase, which now depends on pcre2.
    @ttuegel
    ttuegel committed Jun 24, 2017
    Copy the full SHA
    22b10ba View commit details

  2. khotkeys: fix intermittant parallel build failure

    @ttuegel
    ttuegel committed Jun 24, 2017
    2
    Copy the full SHA
    69438a3 View commit details

  3. Merge pull request #26817 from ttuegel/qt-5.9 

    Qt 5.9
    Thomas Tuegel authored Jun 24, 2017
    Copy the full SHA
    1593bd2 View commit details
Showing with 538 additions and 555 deletions.
  1. +1 −0 pkgs/desktops/plasma-5/khotkeys.nix
  2. +1 −2 pkgs/desktops/plasma-5/plasma-workspace/default.nix
  3. +2 −2 pkgs/development/libraries/kde-frameworks/kjs.nix
  4. +0 −3 pkgs/development/libraries/qt-5/5.8/fetch.sh
  5. +0 −41 pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch
  6. +0 −97 pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
  7. +0 −325 pkgs/development/libraries/qt-5/5.8/srcs.nix
  8. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/default.nix
  9. +3 −0 pkgs/development/libraries/qt-5/5.9/fetch.sh
  10. +32 −32 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtbase/cmake-paths.patch
  11. +4 −4 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtbase/compose-search-path.patch
  12. +2 −2 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtbase/default.nix
  13. +5 −5 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtbase/dlopen-gl.patch
  14. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtbase/dlopen-gtkstyle.patch
  15. +5 −8 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtbase/dlopen-libXcursor.patch
  16. +8 −8 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtbase/dlopen-resolv.patch
  17. +4 −4 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtbase/library-paths.patch
  18. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtbase/libressl.patch
  19. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtbase/qgtk-env.patch
  20. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtbase/qnativesocketengine-type-pun.patch
  21. +0 −1 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtbase/series
  22. +4 −4 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtbase/tzdir.patch
  23. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtconnectivity.nix
  24. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtdeclarative/default.nix
  25. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtdeclarative/import-paths.patch
  26. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtdeclarative/series
  27. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtdoc.nix
  28. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtgraphicaleffects.nix
  29. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtimageformats.nix
  30. +2 −0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtlocation.nix
  31. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtmacextras.nix
  32. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtmultimedia.nix
  33. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtquickcontrols.nix
  34. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtquickcontrols2.nix
  35. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtscript/0001-glib-2.32.patch
  36. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtscript/default.nix
  37. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtsensors.nix
  38. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtserialport/default.nix
  39. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtserialport/qtserialport-dlopen-udev.patch
  40. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtserialport/series
  41. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtsvg.nix
  42. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qttools/cmake-paths.patch
  43. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qttools/default.nix
  44. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qttools/series
  45. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qttranslations.nix
  46. +1 −1 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtwayland.nix
  47. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtwebchannel.nix
  48. +113 −0 pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix
  49. +13 −11 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtwebengine/qtwebengine-paxmark-mksnapshot.patch
  50. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtwebkit/default.nix
  51. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtwebkit/qtwebkit-dlopen-gtk.patch
  52. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtwebkit/qtwebkit-dlopen-udev.patch
  53. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtwebkit/qtwebkit-icucore-darwin.patch
  54. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtwebkit/series
  55. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtwebsockets.nix
  56. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtx11extras.nix
  57. 0 pkgs/development/libraries/qt-5/{5.8 → 5.9}/qtxmlpatterns.nix
  58. +333 −0 pkgs/development/libraries/qt-5/5.9/srcs.nix
  59. +5 −5 pkgs/top-level/all-packages.nix
1 change: 1 addition & 0 deletions pkgs/desktops/plasma-5/khotkeys.nix
View file
Original file line number Diff line number Diff line change
@@ -13,4 +13,5 @@ mkDerivation {
plasma-framework plasma-workspace qtx11extras
];
outputs = [ "out" "dev" "bin" ];
enableParallelBuild = false;
}
3 changes: 1 addition & 2 deletions pkgs/desktops/plasma-5/plasma-workspace/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,8 +20,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
isocodes libdbusmenu libSM libXcursor libXtst pam wayland
];
propagatedBuildInputs = [

baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
knotifyconfig kpackage krunner kscreenlocker ktexteditor ktextwidgets
4 changes: 2 additions & 2 deletions pkgs/development/libraries/kde-frameworks/kjs.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
qtbase,
pcre, qtbase,
}:

mkDerivation {
name = "kjs";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ qtbase ];
buildInputs = [ pcre qtbase ];
}
3 changes: 0 additions & 3 deletions pkgs/development/libraries/qt-5/5.8/fetch.sh
View file

This file was deleted.

41 changes: 0 additions & 41 deletions pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch
View file

This file was deleted.

97 changes: 0 additions & 97 deletions pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
View file

This file was deleted.

Loading