JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt5: don't pin packages to qt54 now that it is default

Browse Source
This commit is contained in:
Thomas Tuegel 2015-04-08 07:14:04 -05:00
parent d353521423
commit 49ad4c1417
1 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pkgs/top-level/all-packages.nix
View File

@ -6167,9 +6167,7 @@ let
automake = automake111x; automake = automake111x;
}; };
kf57 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.7 { kf57 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.7 { });
qt5 = qt54;
});
kf5_latest = kf57; kf5_latest = kf57;
kf5_stable = kf57; kf5_stable = kf57;
@ -6312,9 +6310,7 @@ let
}; };
libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { }; libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { };
libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt5.nix { libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt5.nix { };
qt5 = qt54;
};
libdc1394 = callPackage ../development/libraries/libdc1394 { }; libdc1394 = callPackage ../development/libraries/libdc1394 { };
@ -7229,16 +7225,11 @@ let
phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt4 {}; phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt4 {};
phonon_qt5 = callPackage ../development/libraries/phonon/qt5 { phonon_qt5 = callPackage ../development/libraries/phonon/qt5 { };
qt5 = qt54;
};
phonon_qt5_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { phonon_qt5_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { };
qt5 = qt54;
}; phonon_qt5_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { };
phonon_qt5_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 {
qt5 = qt54;
};
physfs = callPackage ../development/libraries/physfs { }; physfs = callPackage ../development/libraries/physfs { };
@ -7264,7 +7255,7 @@ let
polkit_qt5 = callPackage ../development/libraries/polkit-qt-1 { polkit_qt5 = callPackage ../development/libraries/polkit-qt-1 {
withQt5 = true; withQt5 = true;
qt5 = qt54; inherit qt5;
}; };
policykit = callPackage ../development/libraries/policykit { }; policykit = callPackage ../development/libraries/policykit { };
@ -7278,8 +7269,8 @@ let
}; };
poppler_qt5 = poppler.override { poppler_qt5 = poppler.override {
qt5 = qt54;
qt5Support = true; qt5Support = true;
inherit qt5;
suffix = "qt5"; suffix = "qt5";
}; };
@ -11012,7 +11003,6 @@ let
kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 { kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 {
kf5 = kf57; kf5 = kf57;
qt5 = qt54;
kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; }; kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; };
}); });
kdeApps_stable = kdeApps_14_12; kdeApps_stable = kdeApps_14_12;
@ -11605,7 +11595,7 @@ let
client = false; client = false;
withKDE = false; withKDE = false;
useQt5 = true; useQt5 = true;
qt = qt54; qt = qt5;
dconf = gnome3.dconf; dconf = gnome3.dconf;
tag = "-qt5"; tag = "-qt5";
}; };
@ -11786,9 +11776,7 @@ let
copy-com = callPackage ../applications/networking/copy-com { }; copy-com = callPackage ../applications/networking/copy-com { };
dropbox = callPackage ../applications/networking/dropbox { dropbox = callPackage ../applications/networking/dropbox { };
qt5 = qt54;
};
dropbox-cli = callPackage ../applications/networking/dropbox-cli { }; dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
@ -11809,9 +11797,7 @@ let
printrun = callPackage ../applications/misc/printrun { }; printrun = callPackage ../applications/misc/printrun { };
sddm = callPackage ../applications/display-managers/sddm { sddm = callPackage ../applications/display-managers/sddm { };
qt5 = qt54;
};
slim = callPackage ../applications/display-managers/slim { slim = callPackage ../applications/display-managers/slim {
libpng = libpng12; libpng = libpng12;
@ -12177,8 +12163,8 @@ let
vlc_qt5 = vlc.override { vlc_qt5 = vlc.override {
qt4 = null; qt4 = null;
qt5 = qt54;
withQt5 = true; withQt5 = true;
inherit qt5;
}; };
vmpk = callPackage ../applications/audio/vmpk { }; vmpk = callPackage ../applications/audio/vmpk { };
@ -13216,7 +13202,6 @@ let
numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { }; numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { };
plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 { plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {
qt5 = qt54;
kf5 = kf57; kf5 = kf57;
}); });
plasma5_latest = plasma52; plasma5_latest = plasma52;