Skip to content

Commit

Permalink
Revert "qt5: Add qtnetworkauth submodule"
Browse files Browse the repository at this point in the history
  • Loading branch information
@peti
peti committed Nov 11, 2017
1 parent c6d9b5d commit c1c21cd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
7 changes: 3 additions & 4 deletions pkgs/development/libraries/qt-5/5.9/default.nix
View file
Expand Up @@ -82,7 +82,6 @@ let
qtmultimedia = callPackage ../modules/qtmultimedia.nix {
inherit gstreamer gst-plugins-base;
};
qtnetworkauth = callPackage ./qtnetworkauth.nix {};
qtquick1 = null;
qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};
qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
Expand All @@ -103,9 +102,9 @@ let
env = callPackage ../qt-env.nix {};
full = env "qt-${qtbase.version}" ([
qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
qtimageformats qtlocation qtmultimedia qtnetworkauth qtquickcontrols
qtscript qtsensors qtserialport qtsvg qttools qttranslations
qtwebsockets qtx11extras qtxmlpatterns
qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript
qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets
qtx11extras qtxmlpatterns
] ++ optional (!stdenv.isDarwin) qtwayland
++ optional (stdenv.isDarwin) qtmacextras);

Expand Down
7 changes: 0 additions & 7 deletions pkgs/development/libraries/qt-5/5.9/qtnetworkauth.nix
View file

This file was deleted.

3 comments on commit c1c21cd

@bjornfor
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@orivej
Copy link
Contributor

@orivej orivej commented on c1c21cd Nov 11, 2017 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.