Skip to content

Commit c1c21cd

Browse files
petipeti
authoredNov 11, 2017
Revert "qt5: Add qtnetworkauth submodule"
·
branch-off-24.1118.03-beta
1 parent c6d9b5d commit c1c21cd

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed
 

‎pkgs/development/libraries/qt-5/5.9/default.nix

+3-4
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ let
8282
qtmultimedia = callPackage ../modules/qtmultimedia.nix {
8383
inherit gstreamer gst-plugins-base;
8484
};
85-
qtnetworkauth = callPackage ./qtnetworkauth.nix {};
8685
qtquick1 = null;
8786
qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};
8887
qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
@@ -103,9 +102,9 @@ let
103102
env = callPackage ../qt-env.nix {};
104103
full = env "qt-${qtbase.version}" ([
105104
qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
106-
qtimageformats qtlocation qtmultimedia qtnetworkauth qtquickcontrols
107-
qtscript qtsensors qtserialport qtsvg qttools qttranslations
108-
qtwebsockets qtx11extras qtxmlpatterns
105+
qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript
106+
qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets
107+
qtx11extras qtxmlpatterns
109108
] ++ optional (!stdenv.isDarwin) qtwayland
110109
++ optional (stdenv.isDarwin) qtmacextras);
111110

‎pkgs/development/libraries/qt-5/5.9/qtnetworkauth.nix

-7
This file was deleted.

3 commit comments

Comments
 (3)

bjornfor commented on Nov 11, 2017

@bjornfor
bjornfor
on Nov 11, 2017
Contributor

Please say why a revert is made (in the commit message).

orivej commented on Nov 11, 2017

@orivej
orivej
on Nov 11, 2017edited by orivej
Contributor

I agree with this request, but this was made in a PR, which is easily discoverable with git whence:

$ git whence c1c21cd
5e94dc8 Merge pull request #31528 from NixOS/revert-28480-qt5

bjornfor commented on Nov 11, 2017

@bjornfor
bjornfor
on Nov 11, 2017
Contributor

Thanks for the tip about git whence. But let's not use the existence of that tool as an invitation to put the "why" part of commits in GitHub PR messages instead of the git repo. On the submitter's side, both methods have the same cost, but for git log readers the former is more expensive (have to do extra lookup). Also, GitHub is centralized and requires online access.

Please sign in to comment.