Skip to content

qt512: 5.12.7 -> 5.12.9 #107483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ttuegel merged 6 commits into from
Dec 30, 2020
Merged

qt512: 5.12.7 -> 5.12.9 #107483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d342045
qt512: 5.12.7 -> 5.12.9
doronbehar Dec 23, 2020
6d13b4c
qt5: Update comment regarding updating srcs.nix
doronbehar Dec 23, 2020
a06ee97
sleepyhead: Mention why it won't use qt > 5.12
doronbehar Dec 23, 2020
2c1015f
plex-media-player: explain a bit the qt5 situation
doronbehar Dec 23, 2020
7ad98e2
boomerang: mention why it won't build with qt > 5.12
doronbehar Dec 23, 2020
845a460
sdrangel: 4.21.1 -> 6.4.0
doronbehar Dec 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/applications/radio/sdrangel/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ uhd

mkDerivation rec {
pname = "sdrangel";
version = "4.21.1";
version = "6.4.0";

src = fetchFromGitHub {
owner = "f4exb";
repo = "sdrangel";
rev = "v${version}";
sha256 = "y6BVwnSJXiapgm9pAuby1DLLeU5MSyB4uqEa3oS35/U=";
sha256 = "4iJoKs0BHmBR6JRFuTIqs0GW3SjhPRMPRlqdyTI38T4=";
fetchSubmodules = false;
};

Expand Down
15 changes: 1 addition & 14 deletions pkgs/development/libraries/qt-5/5.12/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ top-level attribute to `top-level/all-packages.nix`.

1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
2. From the top of the Nixpkgs tree, run
`./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
`./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION`.
3. Check that the new packages build correctly.
4. Commit the changes and open a pull request.

Expand Down Expand Up @@ -75,19 +75,6 @@ let
# Ensure -I${includedir} is added to Cflags in pkg-config files.
# See https://github.com/NixOS/nixpkgs/issues/52457
./qtbase.patch.d/0014-qtbase-pkg-config.patch

# https://bugreports.qt.io/browse/QTBUG-81715
# remove after updating to qt > 5.12.7
(fetchpatch {
name = "fix-qt5_make_output_file-cmake-macro.patch";
url = "https://code.qt.io/cgit/qt/qtbase.git/patch/?id=8a3fde00bf53d99e9e4853e8ab97b0e1bcf74915";
sha256 = "1gpcbdpyazdxnmldvhsf3pfwr2gjvi08x3j6rxf543rq01bp6cpx";
})
(fetchpatch {
name = "QTBUG-78937.patch";
url = "https://code.qt.io/cgit/qt/qtbase.git/patch/?id=67a9c600ad14ee44501a6df3509daa8234b97606";
sha256 = "1jiky1w9j8rka78r4q0yabb8w2l5j6csdjysynz7gs1ry4xjfdxd";
})
];
qtdeclarative = [ ./qtdeclarative.patch ];
qtscript = [ ./qtscript.patch ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/libraries/qt-5/5.12/fetch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/ )
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.9/submodules/ )
323 changes: 162 additions & 161 deletions pkgs/development/libraries/qt-5/5.12/srcs.nix
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkgs/development/libraries/qt-5/5.14/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ top-level attribute to `top-level/all-packages.nix`.

1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
2. From the top of the Nixpkgs tree, run
`./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
`./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION`.
3. Check that the new packages build correctly.
4. Commit the changes and open a pull request.

Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/libraries/qt-5/5.15/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ top-level attribute to `top-level/all-packages.nix`.

1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
2. From the top of the Nixpkgs tree, run
`./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
`./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION`.
3. Check that the new packages build correctly.
4. Commit the changes and open a pull request.

Expand Down
5 changes: 4 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1601,6 +1601,7 @@ in

boringtun = callPackage ../tools/networking/boringtun { };

# Upstream recommends qt5.12 and it doesn't build with qt5.15
boomerang = libsForQt512.callPackage ../development/tools/boomerang { };

boost-build = callPackage ../development/tools/boost-build { };
Expand Down Expand Up @@ -7348,6 +7349,7 @@ in

sleuthkit = callPackage ../tools/system/sleuthkit {};

# Not updated upstream since 2018, doesn't support qt newer than 5.12
sleepyhead = libsForQt512.callPackage ../applications/misc/sleepyhead {};

slirp4netns = callPackage ../tools/networking/slirp4netns/default.nix { };
Expand Down Expand Up @@ -19154,7 +19156,7 @@ in

sdparm = callPackage ../os-specific/linux/sdparm { };

sdrangel = libsForQt512.callPackage ../applications/radio/sdrangel { };
sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { };

sepolgen = callPackage ../os-specific/linux/sepolgen { };

Expand Down Expand Up @@ -23528,6 +23530,7 @@ in

plexamp = callPackage ../applications/audio/plexamp { };

# Upstream says it supports only qt5.9 which is not packaged, and building with qt newer than 5.12 fails
plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { };

plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { };
Expand Down