From 7ad0ca11ce349d47d1008a7da703e7eca2abba06 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Wed, 4 Nov 2020 22:47:13 +0100 Subject: [PATCH 01/57] digitalbitbox: 2.2.2 -> 3.0.0 --- .../misc/digitalbitbox/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index 95159d1927ab..0c731aca713f 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ mkDerivation +, lib , autoreconfHook , curl , fetchFromGitHub @@ -7,7 +8,7 @@ , libtool , qrencode , udev -, libusb-compat-0_1 +, libusb1 , makeWrapper , pkgconfig , qtbase @@ -46,18 +47,18 @@ let copyUdevRuleToOutput = name: rule: "cp ${writeText name rule} $out/etc/udev/rules.d/${name}"; -in stdenv.mkDerivation rec { +in mkDerivation rec { pname = "digitalbitbox"; - version = "2.2.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "digitalbitbox"; repo = "dbb-app"; rev = "v${version}"; - sha256 = "1r77fvqrlaryzij5dfbnigzhvg1d12g96qb2gp8dy3xph1j0k3s1"; + sha256 = "ig3+TdYv277D9GVnkRSX6nc6D6qruUOw/IQdQCK6FoA="; }; - nativeBuildInputs = with stdenv.lib; [ + nativeBuildInputs = with lib; [ autoreconfHook curl git @@ -70,7 +71,7 @@ in stdenv.mkDerivation rec { libevent libtool udev - libusb-compat-0_1 + libusb1 qrencode qtbase @@ -93,6 +94,8 @@ in stdenv.mkDerivation rec { "format" ]; + qtWrapperArgs = [ ''--prefix LD_LIBRARY_PATH : $out/lib'' ]; + postInstall = '' mkdir -p "$out/lib" cp src/libbtc/.libs/*.so* $out/lib @@ -103,9 +106,6 @@ in stdenv.mkDerivation rec { # [RPATH][patchelf] Avoid forbidden reference error rm -rf $PWD - wrapProgram "$out/bin/dbb-cli" --prefix LD_LIBRARY_PATH : "$out/lib" - wrapProgram "$out/bin/dbb-app" --prefix LD_LIBRARY_PATH : "$out/lib" - # Provide udev rules as documented in https://digitalbitbox.com/start_linux mkdir -p "$out/etc/udev/rules.d" ${copyUdevRuleToOutput "51-hid-digitalbox.rules" udevRule51} @@ -114,7 +114,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A QT based application for the Digital Bitbox hardware wallet"; longDescription = '' Digital Bitbox provides dbb-app, a GUI tool, and dbb-cli, a CLI tool, to manage Digital Bitbox devices. @@ -138,6 +138,5 @@ in stdenv.mkDerivation rec { vidbina ]; platforms = platforms.linux; - broken = true; }; } From 768733f552e7d94d5303efd25729c0fd959754ef Mon Sep 17 00:00:00 2001 From: freezeboy Date: Wed, 4 Nov 2020 22:58:36 +0100 Subject: [PATCH 02/57] qlcplus: 4.12.2 -> 4.12.3 --- pkgs/applications/misc/qlcplus/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index b47d8feecf76..452629b6181d 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qlcplus"; - version = "4.12.2"; + version = "4.12.3"; src = fetchFromGitHub { owner = "mcallegari"; repo = "qlcplus"; rev = "QLC+_${version}"; - sha256 = "1j0jhgql78p5ghcaz36l1k55447s5qiv396a448qic7xqpym2vl3"; + sha256 = "PB1Y8N1TrJMcS7A2e1nKjsUlAxOYjdJqBhbyuDCAbGs="; }; nativeBuildInputs = [ qmake pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d520ab046d12..dd46cd3012db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6689,7 +6689,7 @@ in qarte = libsForQt5.callPackage ../applications/video/qarte { }; - qlcplus = libsForQt512.callPackage ../applications/misc/qlcplus { }; + qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; qnial = callPackage ../development/interpreters/qnial { }; From 9cbe9b5d04bb684598c0074755871a5fe94c6483 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Wed, 4 Nov 2020 23:25:29 +0100 Subject: [PATCH 03/57] golden-cheetah: use Qt5.14 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd46cd3012db..ca8a3881b363 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28312,7 +28312,7 @@ in inherit pkgs; }; - golden-cheetah = libsForQt512.callPackage ../applications/misc/golden-cheetah {}; + golden-cheetah = libsForQt514.callPackage ../applications/misc/golden-cheetah {}; linkchecker = callPackage ../tools/networking/linkchecker { }; From ba898ae44c12c8b8f55a117596440fdc68de504e Mon Sep 17 00:00:00 2001 From: freezeboy Date: Wed, 4 Nov 2020 23:26:33 +0100 Subject: [PATCH 04/57] sdrangel: 4.11.12 -> 4.21.1 --- pkgs/applications/radio/sdrangel/default.nix | 29 ++++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 6d0a19334dec..dd8c56610c28 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -13,47 +13,40 @@ libav, libiio, libopus, libpulseaudio, -libusb-compat-0_1, +libusb1, limesuite, +libbladeRF, mkDerivation, ocl-icd, opencv3, pkgconfig, qtbase, qtmultimedia, +qtserialport, qtwebsockets, rtl-sdr, -serialdv +serialdv, +uhd }: -let - - codec2' = codec2.overrideAttrs (old: { - src = fetchFromGitHub { - owner = "drowe67"; - repo = "codec2"; - rev = "567346818c0d4d697773cf66d925fdb031e15668"; - sha256 = "0ngqlh2cw5grx2lg7xj8baz6p55gfhq4caggxkb4pxlg817pwbpa"; - }; - }); - -in mkDerivation rec { +mkDerivation rec { pname = "sdrangel"; - version = "4.11.12"; + version = "4.21.1"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "0zbx0gklylk8npb3wnnmqpam0pdxl40f20i3wzwwh4gqrppxywzx"; + sha256 = "y6BVwnSJXiapgm9pAuby1DLLeU5MSyB4uqEa3oS35/U="; fetchSubmodules = false; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - glew opencv3 libusb-compat-0_1 boost libopus limesuite libav libiio libpulseaudio + glew opencv3 libusb1 boost libopus limesuite libav libiio libpulseaudio qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf - fftwFloat codec2' cm256cc serialdv + fftwFloat codec2 cm256cc serialdv qtserialport + libbladeRF uhd ]; cmakeFlags = [ "-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv" From fbab63ecd5b931ee7702982a04b3cdb198f7e5b4 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Wed, 4 Nov 2020 23:40:31 +0100 Subject: [PATCH 05/57] plex-media-player: 2.55.0.1069 -> 2.58.0.1076 --- .../video/plex-media-player/default.nix | 6 +++--- pkgs/applications/video/plex-media-player/deps.nix | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index d08a4a852428..0530af6f222c 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -11,14 +11,14 @@ let depSrcs = import ./deps.nix { inherit fetchurl; }; in mkDerivation rec { pname = "plex-media-player"; - version = "2.55.0.1069"; - vsnHash = "2369bed9"; + version = "2.58.0.1076"; + vsnHash = "38e019da"; src = fetchFromGitHub { owner = "plexinc"; repo = "plex-media-player"; rev = "v${version}-${vsnHash}"; - sha256 = "1jq4592sgaia0xy2h7n3vh5i7c84sdh4l64fdc774r4i0bmg66qi"; + sha256 = "XFwcSHn9wG30bDMGFITBmhp6/VI1RLmxMxFFxjntTmw="; }; nativeBuildInputs = [ pkgconfig cmake python3 ]; diff --git a/pkgs/applications/video/plex-media-player/deps.nix b/pkgs/applications/video/plex-media-player/deps.nix index 26b57532615a..fddbae9375c7 100644 --- a/pkgs/applications/video/plex-media-player/deps.nix +++ b/pkgs/applications/video/plex-media-player/deps.nix @@ -1,28 +1,28 @@ { fetchurl }: rec { - webClientBuildId = "180-afec74de50e175"; + webClientBuildId = "183-045db5be50e175"; webClientDesktopBuildId = "4.29.2-e50e175"; - webClientTvBuildId = "4.29.3-afec74d"; + webClientTvBuildId = "4.29.6-045db5b"; webClient = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake"; - sha256 = "0rabrg3lk9vgpswk8npa54hzqf2v8ghqqnysxpwn12wrp1pc2rr9"; + sha256 = "AzHlO7Z8SxQoT6++OphwDDQ47Ombnpaby0mh1YNnSvc="; }; webClientDesktopHash = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1"; - sha256 = "02b5yq4yc411qlg2dkw5j9lrr3cn2y4d27sin0skf6qza180473g"; + sha256 = "7vUcTuN5ypFFIrBygyutEZu4MYl5WPmFureQl6HvVx8="; }; webClientDesktop = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz"; - sha256 = "0l3xv48kr2rx878a40zrgwif2ga2ikv6fdcbq9pylycnmm41pxmh"; + sha256 = "xWwXhN2N4Pvalxtm5PwZprkcFU6RIiE6fA71d2E6lP4="; }; webClientTvHash = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1"; - sha256 = "0wq115y2xrgwqrzr43nhkq8ba237z20yfp426ki2kdypsq8fjqka"; + sha256 = "U8u5SOxPpz8HOJKrYXlIHx0X08Flspl67hlzc57g7v8="; }; webClientTv = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz"; - sha256 = "1wax1qslm226l2w53m2fnl849jw349qhg3rjghx7vip5pmb43vw9"; + sha256 = "4Et9d4BO+4UParvsSJglJvb+cnp0oUP3O4MDNnLeP7g="; }; } From 62b77c5bbc0e789823eb223050e894066f47bc78 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 00:08:06 +0100 Subject: [PATCH 06/57] teamspeak_client: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca8a3881b363..7dec2b9fc649 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23875,7 +23875,7 @@ in teams = callPackage ../applications/networking/instant-messengers/teams { }; - teamspeak_client = libsForQt512.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; + teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; taskell = haskell.lib.justStaticExecutables haskellPackages.taskell; From 568befb1fda97ad2d8340e62300f7e9d97afc2f8 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 00:21:09 +0100 Subject: [PATCH 07/57] protonmail-bridge: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7dec2b9fc649..a485549e974d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23169,7 +23169,7 @@ in properties-cpp = callPackage ../development/libraries/properties-cpp { }; - protonmail-bridge = libsForQt512.callPackage ../applications/networking/protonmail-bridge { }; + protonmail-bridge = libsForQt5.callPackage ../applications/networking/protonmail-bridge { }; protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { }; From 8053c25b2f1bc89eda9fff8516dc23ff8400a6d3 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 15:48:37 +0100 Subject: [PATCH 08/57] vnote: 2.8.2 2.8.2 -> 2.10 Also migrate to Qt5.15 --- pkgs/applications/office/vnote/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/applications/office/vnote/default.nix index 80b6ef6243ca..b266ce86e2ac 100644 --- a/pkgs/applications/office/vnote/default.nix +++ b/pkgs/applications/office/vnote/default.nix @@ -3,7 +3,7 @@ let description = "A note-taking application that knows programmers and Markdown better"; in mkDerivation rec { - version = "2.8.2"; + version = "2.10"; pname = "vnote"; src = fetchFromGitHub { @@ -11,7 +11,7 @@ in mkDerivation rec { repo = "vnote"; fetchSubmodules = true; rev = "v${version}"; - sha256 = "18qffq5c2plr5rjb5lafhdz1v5kbbb2wiyacgdhh3xni3khni52l"; + sha256 = "EeeVGnKI0irLO1zJQxlVlIUhqG987JIgxNvKpUgLxUQ="; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a485549e974d..640155e3a51a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27997,7 +27997,7 @@ in ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; }; - vnote = libsForQt514.callPackage ../applications/office/vnote { }; + vnote = libsForQt5.callPackage ../applications/office/vnote { }; ssh-audit = callPackage ../tools/security/ssh-audit { }; From 43dbe816401ed0539bc08d2ff63f2eead78f85a1 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 16:07:07 +0100 Subject: [PATCH 09/57] tellico: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 640155e3a51a..d5b39f40f575 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27946,7 +27946,7 @@ in prow = callPackage ../applications/networking/cluster/prow { }; - tellico = libsForQt514.callPackage ../applications/misc/tellico { }; + tellico = libsForQt5.callPackage ../applications/misc/tellico { }; termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {}; From 6683f3bf65de78bc02320d46e255d17b0d28043b Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 16:19:32 +0100 Subject: [PATCH 10/57] calaos_installer: 3.1 -> 3.5 Also migrate to Qt 5.15 --- pkgs/misc/calaos/installer/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/calaos/installer/default.nix b/pkgs/misc/calaos/installer/default.nix index 6254c9c24f4b..ee7c089bc8ee 100644 --- a/pkgs/misc/calaos/installer/default.nix +++ b/pkgs/misc/calaos/installer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, stdenv, fetchFromGitHub, qmake, qttools, qtbase }: mkDerivation rec { - name = "calaos_installer-3.1"; - version = "3.1"; + pname = "calaos_installer"; + version = "3.5"; src = fetchFromGitHub { owner = "calaos"; repo = "calaos_installer"; rev = "v${version}"; - sha256 = "0g8igj5sax5vjqzrpbil7i6329708lqqwvg5mwiqd0zzzha9sawd"; + sha256 = "hx7XVF2iueKFR67U0EvSK1vYZnJBnuOpUOkSjx7h1XY="; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5b39f40f575..7249629a3b21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27147,7 +27147,7 @@ in cached-nix-shell = callPackage ../tools/nix/cached-nix-shell {}; - calaos_installer = libsForQt514.callPackage ../misc/calaos/installer {}; + calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {}; ccemux = callPackage ../misc/emulators/ccemux { }; From ed7a64c4eeb26477ac6a806d3f1a873569201c50 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 16:35:59 +0100 Subject: [PATCH 11/57] qcsxcad: migrate to Qt511 + additional cleanup * Split into multiple outputs * Rewrite the derivation without stdenv --- .../libraries}/science/electronics/qcsxcad/default.nix | 9 ++++----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/{applications => development/libraries}/science/electronics/qcsxcad/default.nix (86%) diff --git a/pkgs/applications/science/electronics/qcsxcad/default.nix b/pkgs/development/libraries/science/electronics/qcsxcad/default.nix similarity index 86% rename from pkgs/applications/science/electronics/qcsxcad/default.nix rename to pkgs/development/libraries/science/electronics/qcsxcad/default.nix index c12678c0047d..7e73354363ea 100644 --- a/pkgs/applications/science/electronics/qcsxcad/default.nix +++ b/pkgs/development/libraries/science/electronics/qcsxcad/default.nix @@ -1,11 +1,10 @@ -{ stdenv +{ lib , mkDerivation , fetchFromGitHub , cmake , csxcad , tinyxml , vtkWithQt5 -, wrapQtAppsHook , qtbase }: @@ -20,13 +19,13 @@ mkDerivation { sha256 = "11kbh0mxbdfh7s5azqin3i2alic5ihmdfj0jwgnrhlpjk4cbf9rn"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake - wrapQtAppsHook ]; cmakeFlags = [ - "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" "-DCSXCAD_ROOT_DIR=${csxcad}" "-DENABLE_RPATH=OFF" ]; @@ -40,7 +39,7 @@ mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt library for CSXCAD"; homepage = "https://github.com/thliebig/QCSXCAD"; license = licenses.gpl3; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ddd94bc9b9a4..3731cf64f778 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -471,6 +471,7 @@ mapAliases ({ phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22 phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 + qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05 quake3game = ioquake3; # added 2016-01-14 qvim = throw "qvim has been removed."; # added 2020-08-31 qwt6 = libsForQt5.qwt; # added 2015-12-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7249629a3b21..159d82d6c85f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15446,6 +15446,8 @@ in qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + qcsxcad = callPackage ../development/libraries/science/electronics/qcsxcad { }; + qmltermwidget = callPackage ../development/libraries/qmltermwidget { inherit (darwin.apple_sdk.libs) utmp; }; @@ -26870,8 +26872,6 @@ in pcb = callPackage ../applications/science/electronics/pcb { }; - qcsxcad = libsForQt514.callPackage ../applications/science/electronics/qcsxcad { }; - qucs = callPackage ../applications/science/electronics/qucs { }; xcircuit = callPackage ../applications/science/electronics/xcircuit { }; From f2335a5d9827066aa0e317b95cf08403d400d4ee Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 17:01:38 +0100 Subject: [PATCH 12/57] appcsxcad: migrate to Qt5.15 * remove useless wrapQtAppsHook --- pkgs/applications/science/electronics/appcsxcad/default.nix | 1 - pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/appcsxcad/default.nix b/pkgs/applications/science/electronics/appcsxcad/default.nix index d2b7c0d66a15..c2d7cefec9b8 100644 --- a/pkgs/applications/science/electronics/appcsxcad/default.nix +++ b/pkgs/applications/science/electronics/appcsxcad/default.nix @@ -27,7 +27,6 @@ mkDerivation { nativeBuildInputs = [ cmake - wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 159d82d6c85f..13c8d4367592 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26820,7 +26820,7 @@ in adms = callPackage ../applications/science/electronics/adms { }; - appcsxcad = libsForQt514.callPackage ../applications/science/electronics/appcsxcad { }; + appcsxcad = libsForQt5.callPackage ../applications/science/electronics/appcsxcad { }; # Since version 8 Eagle requires an Autodesk account and a subscription # in contrast to single payment for the charged editions. From 1bb18de6e15635150c81b72c82600177faff214e Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 16:41:27 +0100 Subject: [PATCH 13/57] eagle: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13c8d4367592..aa30d5d1be3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26829,7 +26829,7 @@ in openssl = openssl_1_0_2; }; - eagle = libsForQt514.callPackage ../applications/science/electronics/eagle/eagle.nix { }; + eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { }; caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { }; From 9950899236f8530633a4d52c0dffb461365ed8a0 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 17:07:41 +0100 Subject: [PATCH 14/57] xflr5: migrate to Qt5.15 rewrite without wrapQtAppsHook and stdenv --- pkgs/applications/science/physics/xflr5/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/physics/xflr5/default.nix b/pkgs/applications/science/physics/xflr5/default.nix index b2e5284796f8..5ae56528f964 100644 --- a/pkgs/applications/science/physics/xflr5/default.nix +++ b/pkgs/applications/science/physics/xflr5/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchurl, wrapQtAppsHook, qmake }: +{ mkDerivation, lib, fetchurl, qmake }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "xflr5"; version = "6.47"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ qmake wrapQtAppsHook ]; + nativeBuildInputs = [ qmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An analysis tool for airfoils, wings and planes"; homepage = https://sourceforge.net/projects/xflr5/; license = licenses.gpl3; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa30d5d1be3c..aa3845c639f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26591,7 +26591,7 @@ in xfitter = callPackage ../applications/science/physics/xfitter {}; - xflr5 = libsForQt514.callPackage ../applications/science/physics/xflr5 { }; + xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { }; ### SCIENCE/PROGRAMMING From 9f930f68c0f7153c00db33e0ba78a8cfa6b3a020 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 17:35:29 +0100 Subject: [PATCH 15/57] solarus: move to multiple outputs motivation: Let solarus-quest-editor require only required bits --- pkgs/games/solarus/default.nix | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix index c0daa99c15a6..c204846ae2fc 100644 --- a/pkgs/games/solarus/default.nix +++ b/pkgs/games/solarus/default.nix @@ -1,26 +1,34 @@ -{ lib, mkDerivation, fetchFromGitLab, cmake, luajit, - SDL2, SDL2_image, SDL2_ttf, physfs, - openal, libmodplug, libvorbis, - qtbase, qttools }: +{ lib, mkDerivation, fetchFromGitLab, cmake, luajit +, SDL2, SDL2_image, SDL2_ttf, physfs, glm +, openal, libmodplug, libvorbis +, qtbase, qttools }: mkDerivation rec { pname = "solarus"; - version = "1.6.2"; + version = "1.6.4"; src = fetchFromGitLab { owner = "solarus-games"; repo = pname; rev = "v${version}"; - sha256 = "0d0xfjbmamz84aajxfc0fwrj8862xxbxz6n4xnc05r1m4g7gba77"; + sha256 = "sbdlf+R9OskDQ5U5rqUX2gF8l/fj0sDJv6BL7H1I1Ng="; }; - buildInputs = [ cmake luajit SDL2 + outputs = [ "out" "lib" "dev" ]; + + nativeBuildInputs = [ cmake qttools ]; + buildInputs = [ luajit SDL2 SDL2_image SDL2_ttf physfs openal libmodplug libvorbis - qtbase qttools ]; + qtbase glm ]; enableParallelBuilding = true; + preFixup = '' + mkdir $lib/ + mv $out/lib $lib + ''; + meta = with lib; { description = "A Zelda-like ARPG game engine"; longDescription = '' From 94f44a689552a4d9fb0a2bd046b939460d7bb01b Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 17:47:20 +0100 Subject: [PATCH 16/57] samplv1: 0.9.13 -> 0.9.18, migrate to Qt5.15 Rewrite without stdenv --- pkgs/applications/audio/samplv1/default.nix | 17 ++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 86f8f666d80d..17b3f1c3745c 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, libjack2, alsaLib, liblo, libsndfile, lv2, qt5 }: +{ mkDerivation, lib, fetchurl, pkgconfig, libjack2 +, alsaLib, liblo, libsndfile, lv2, qtbase, qttools +, rubberband +}: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "samplv1"; - version = "0.9.13"; + version = "0.9.18"; src = fetchurl { url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz"; - sha256 = "0clsp6s5qfnh0xaxbd35vq2ppi72q9dfayrzlgl73800a8p7gh9m"; + sha256 = "ePhM9OTLJp1Wa2D9Y1Dqq/69WlEhEp3ih9yNUIJU5Y4="; }; - buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; + nativeBuildInputs = [ qttools pkgconfig ]; - nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qtbase rubberband ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx"; homepage = "http://samplv1.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa3845c639f1..8f9f8d719bcc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25690,7 +25690,7 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa; }; - samplv1 = callPackage ../applications/audio/samplv1 { qt5 = qt514; }; + samplv1 = libsForQt5.callPackage ../applications/audio/samplv1 { }; sauerbraten = callPackage ../games/sauerbraten {}; From 8e375d71f03c0ab1f622d2f38b4ea406be86de89 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 18:12:42 +0100 Subject: [PATCH 17/57] saga: 7.7.0 -> 7.8.1 * Remove obsolete patches (merged into this release) * rewrite without stdenv --- pkgs/applications/gis/saga/clang_patch.patch | 19 ------------------ pkgs/applications/gis/saga/default.nix | 21 +++++++++----------- pkgs/applications/gis/saga/finite.patch | 13 ------------ pkgs/applications/gis/saga/opencv4.patch | 14 ------------- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 10 insertions(+), 59 deletions(-) delete mode 100644 pkgs/applications/gis/saga/clang_patch.patch delete mode 100644 pkgs/applications/gis/saga/finite.patch delete mode 100644 pkgs/applications/gis/saga/opencv4.patch diff --git a/pkgs/applications/gis/saga/clang_patch.patch b/pkgs/applications/gis/saga/clang_patch.patch deleted file mode 100644 index e6af8d130514..000000000000 --- a/pkgs/applications/gis/saga/clang_patch.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit e92b250968e9656084ab5984689747ca615ff6e7 -Author: Volker Wichmann -Date: Sun Mar 5 13:49:53 2017 +0100 - - saga_api, CSG_Table::Del_Records(): bug fix, check record count correctly - -diff --git a/src/saga_core/saga_api/table.cpp b/src/saga_core/saga_api/table.cpp -index 76a1d8d..fa1a66f 100644 ---- a/src/saga_core/saga_api/table.cpp -+++ b/src/saga_core/saga_api/table.cpp -@@ -901,7 +901,7 @@ bool CSG_Table::Del_Record(int iRecord) - //--------------------------------------------------------- - bool CSG_Table::Del_Records(void) - { -- if( m_Records > 0 ) -+ if( m_nRecords > 0 ) - { - _Index_Destroy(); - diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index aa418148209e..50df22c186c9 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -1,4 +1,6 @@ { stdenv +, mkDerivation +, lib , fetchurl # native , autoreconfHook @@ -28,13 +30,13 @@ , fftw }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "saga"; - version = "7.7.0"; + version = "7.8.1"; src = fetchurl { - url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%20${stdenv.lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; - sha256 = "1nmvrlcpcm2pas9pnav13iydnym9d8yqqnwq47lm0j6b0a2wy9zk"; + url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; + sha256 = "qwjuimeoadwf254bwJ7h2vSKaELkcaJdFrGj1WtvnbM="; }; nativeBuildInputs = [ @@ -68,7 +70,7 @@ stdenv.mkDerivation rec { ] # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ Cocoa unixODBC poppler @@ -76,16 +78,11 @@ stdenv.mkDerivation rec { sqlite ]; - patches = [ - # See https://sourceforge.net/p/saga-gis/bugs/280/ - ./opencv4.patch - ]; - enableParallelBuilding = true; - CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing"; + CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing"; - meta = with stdenv.lib; { + meta = with lib; { description = "System for Automated Geoscientific Analyses"; homepage = "http://www.saga-gis.org"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/gis/saga/finite.patch b/pkgs/applications/gis/saga/finite.patch deleted file mode 100644 index 7f60743534bd..000000000000 --- a/pkgs/applications/gis/saga/finite.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/saga-gis/src/modules/imagery/imagery_maxent/me.cpp b/saga-gis/src/modules/imagery/imagery_maxent/me.cpp -index c5da854..d3e9cff 100755 ---- a/src/modules/imagery/imagery_maxent/me.cpp -+++ b/src/modules/imagery/imagery_maxent/me.cpp -@@ -21,7 +21,7 @@ - #ifdef _SAGA_MSW - #define isinf(x) (!_finite(x)) - #else --#define isinf(x) (!finite(x)) -+#define isinf(x) (!isfinite(x)) - #endif - - /** The input array contains a set of log probabilities lp1, lp2, lp3 diff --git a/pkgs/applications/gis/saga/opencv4.patch b/pkgs/applications/gis/saga/opencv4.patch deleted file mode 100644 index 0b26192bf09b..000000000000 --- a/pkgs/applications/gis/saga/opencv4.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/tools/imagery/imagery_opencv/Makefile.am -+++ b/src/tools/imagery/imagery_opencv/Makefile.am -@@ -7,9 +7,9 @@ - - if HAVE_CV - DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD --CXX_INCS = -I$(top_srcdir)/src/saga_core -I/usr/include/opencv -+CXX_INCS = -I$(top_srcdir)/src/saga_core `pkg-config opencv4 --cflags` - AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS) --AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv --libs` -+AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv4 --libs` - pkglib_LTLIBRARIES = libimagery_opencv.la - libimagery_opencv_la_SOURCES =\ - MLB_Interface.cpp\ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f9f8d719bcc..5c96923f50ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25686,7 +25686,7 @@ in rrootage = callPackage ../games/rrootage { }; - saga = libsForQt514.callPackage ../applications/gis/saga { + saga = libsForQt5.callPackage ../applications/gis/saga { inherit (darwin.apple_sdk.frameworks) Cocoa; }; From 92904173001cf23d03e8f9ccd3d338bd2ada963a Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 18:19:38 +0100 Subject: [PATCH 18/57] pentobi: 18.1 -> 18.3 * Rewrite without stdenv and wrapQtAppsHook * Fetch source from GithHub --- pkgs/games/pentobi/default.nix | 24 ++++++++++++------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/games/pentobi/default.nix b/pkgs/games/pentobi/default.nix index f0f6ccb8a129..b8a4935aa267 100644 --- a/pkgs/games/pentobi/default.nix +++ b/pkgs/games/pentobi/default.nix @@ -1,20 +1,20 @@ -{ stdenv, appstream, fetchurl, cmake, gettext, libxslt, librsvg, itstool - , qtbase, qtquickcontrols2, qtsvg, qttools, qtwebview, docbook_xsl - , wrapQtAppsHook +{ lib, mkDerivation, appstream, fetchFromGitHub, cmake, gettext, libxslt, librsvg, itstool +, qtbase, qtquickcontrols2, qtsvg, qttools, qtwebview, docbook_xsl }: -with stdenv.lib; -stdenv.mkDerivation rec { - version = "18.1"; +mkDerivation rec { + version = "18.3"; pname = "pentobi"; - src = fetchurl { - url = "mirror://sourceforge/pentobi/${pname}-${version}.tar.xz"; - sha256 = "1vfw61lk9z7dngncmx3fggy5ld7ksdk48dpwnsq2vl5fh3f71qbq"; + src = fetchFromGitHub { + owner = "enz"; + repo = "pentobi"; + rev = "v${version}"; + sha256 = "9AymvAlXi0zkkcakTR0mC4gmyrweZR4EwlhORkmVshw="; }; - nativeBuildInputs = [ cmake docbook_xsl wrapQtAppsHook ]; - buildInputs = [ appstream qtbase qtsvg qtquickcontrols2 qttools qtwebview itstool librsvg ]; + nativeBuildInputs = [ cmake docbook_xsl qttools ]; + buildInputs = [ appstream qtbase qtsvg qtquickcontrols2 qtwebview itstool librsvg ]; patchPhase = '' substituteInPlace pentobi_thumbnailer/CMakeLists.txt --replace "/manpages" "/share/xml/docbook-xsl/manpages/" @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "-DMETAINFO_ITS=${appstream}/share/gettext/its/metainfo.its" ]; - meta = { + meta = with lib; { description = "A computer opponent for the board game Blokus"; homepage = "https://pentobi.sourceforge.io"; license = licenses.gpl3; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c96923f50ba..4fd0fb97c1c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25601,7 +25601,7 @@ in papermc = callPackage ../games/papermc { }; - pentobi = libsForQt514.callPackage ../games/pentobi { }; + pentobi = libsForQt5.callPackage ../games/pentobi { }; performous = callPackage ../games/performous { boost = boost166; From d29feee8b62c80635acb4f7c4d09eec3e3e5314c Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 18:41:27 +0100 Subject: [PATCH 19/57] chiaki: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fd0fb97c1c2..fe29f3fd4109 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25157,7 +25157,7 @@ in chessx = libsForQt5.callPackage ../games/chessx { }; - chiaki = libsForQt514.callPackage ../games/chiaki { }; + chiaki = libsForQt5.callPackage ../games/chiaki { }; chocolateDoom = callPackage ../games/chocolate-doom { }; From 97b51ad5a9847b7337a3b0a5646b9eb0ce2cb2d4 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 19:20:57 +0100 Subject: [PATCH 20/57] psi: 1.4 -> 1.5 remove useless wrapQtAppsHook and stdenv --- .../instant-messengers/psi/default.nix | 19 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 9f841f50dac3..08c3ab96210f 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,30 +1,33 @@ -{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook +{ lib, mkDerivation, fetchFromGitHub, cmake , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine , libidn, qca-qt5, libXScrnSaver, hunspell }: -stdenv.mkDerivation rec { + +mkDerivation rec { pname = "psi"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "psi-im"; repo = pname; rev = version; - sha256 = "09c7cg96vgxzgbpypgcw7yv73gvzppbi1lm4svbpfn2cfxy059d4"; + sha256 = "hXDZODHl14kimRlMQ1XjISQ2kk9NS78axVN3U21wkuM="; fetchSubmodules = true; }; patches = [ ./fix-cmake-hunspell-1.7.patch ]; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; + nativeBuildInputs = [ cmake qttools ]; buildInputs = [ - qtbase qtmultimedia qtx11extras qttools qtwebengine + qtbase qtmultimedia qtx11extras qtwebengine libidn qca-qt5 libXScrnSaver hunspell ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + + meta = with lib; { + homepage = "https://psi-im.org"; description = "An XMPP (Jabber) client"; maintainers = [ maintainers.raskin ]; license = licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe29f3fd4109..2eab7d596c7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23179,7 +23179,7 @@ in ps2client = callPackage ../applications/networking/ps2client { }; - psi = libsForQt514.callPackage ../applications/networking/instant-messengers/psi { }; + psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { }; psi-plus = libsForQt514.callPackage ../applications/networking/instant-messengers/psi-plus { }; From 8296881706f519f18e1f8b6f4975cacc4587ed36 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 19:21:24 +0100 Subject: [PATCH 21/57] psi-plus: migrate to Qt5.15 remove useless wrapQtAppsHook and stdenv --- .../instant-messengers/psi-plus/default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index cf7c1008a080..1112a3215c9d 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook +{ mkDerivation, lib, fetchFromGitHub, cmake , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine , libidn, qca-qt5, libsecret, libXScrnSaver, hunspell , libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "psi-plus"; version = "1.4.1473"; @@ -19,15 +19,16 @@ stdenv.mkDerivation rec { "-DENABLE_PLUGINS=ON" ]; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; + nativeBuildInputs = [ cmake qttools ]; buildInputs = [ - qtbase qtmultimedia qtx11extras qttools qtwebengine + qtbase qtmultimedia qtx11extras qtwebengine libidn qca-qt5 libsecret libXScrnSaver hunspell libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c ]; - meta = with stdenv.lib; { + meta = with lib; { + homepage = "https://sourceforge.net/projects/psiplus/"; description = "XMPP (Jabber) client"; maintainers = with maintainers; [ orivej misuzu ]; license = licenses.gpl2; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2eab7d596c7e..9964ba0d061c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23181,7 +23181,7 @@ in psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { }; - psi-plus = libsForQt514.callPackage ../applications/networking/instant-messengers/psi-plus { }; + psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { }; psol = callPackage ../development/libraries/psol { }; From 9ea55b4fb55fa541f696488d302a3ac4891902de Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 20:39:02 +0100 Subject: [PATCH 22/57] zoom-us: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9964ba0d061c..a06f67c7f1bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24914,7 +24914,7 @@ in zombietrackergps = libsForQt514.callPackage ../applications/gis/zombietrackergps { }; - zoom-us = libsForQt514.callPackage ../applications/networking/instant-messengers/zoom-us { }; + zoom-us = libsForQt5.callPackage ../applications/networking/instant-messengers/zoom-us { }; zotero = callPackage ../applications/office/zotero { }; From 032bd0fd13a1e055c90cd8b3860cd2f6011f1396 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 20:50:09 +0100 Subject: [PATCH 23/57] webcamoid: migrate to Qt5.15 rewrite without stdenv --- pkgs/applications/video/webcamoid/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/applications/video/webcamoid/default.nix index aa559215fe89..a0d25f2ec1ea 100644 --- a/pkgs/applications/video/webcamoid/default.nix +++ b/pkgs/applications/video/webcamoid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libxcb, mkDerivation, qmake +{ lib, fetchFromGitHub, pkgconfig, libxcb, mkDerivation, qmake , qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2 , ffmpeg-full, gst_all_1, libpulseaudio, alsaLib, jack2 , v4l-utils }: @@ -29,7 +29,7 @@ mkDerivation rec { "INSTALLQMLDIR=${placeholder "out"}/lib/qt/qml" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Webcam Capture Software"; longDescription = "Webcamoid is a full featured and multiplatform webcam suite."; homepage = "https://github.com/webcamoid/webcamoid/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a06f67c7f1bc..712f10edc34a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24376,7 +24376,7 @@ in wayvnc = callPackage ../applications/networking/remote/wayvnc { }; - webcamoid = libsForQt514.callPackage ../applications/video/webcamoid { }; + webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { }; webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {}; From bacf704e013dae2766a240ae0a02da1b74df5155 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 21:30:33 +0100 Subject: [PATCH 24/57] virt-manager-qt: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 712f10edc34a..2dd3d15e2af8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24214,7 +24214,7 @@ in system-libvirt = libvirt; }; - virt-manager-qt = libsForQt514.callPackage ../applications/virtualization/virt-manager/qt.nix { + virt-manager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix { qtermwidget = lxqt.qtermwidget; }; From d1259ed363c67c8938c0849391e18db171df871c Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 21:34:27 +0100 Subject: [PATCH 25/57] kdiff3: migrate to Qt5.15 fix homepage --- pkgs/tools/text/kdiff3/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 9921862b798e..862faadea3f1 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { propagatedBuildInputs = [ kconfig kcrash kinit kparts kiconthemes ]; meta = with lib; { - homepage = "http://kdiff3.sourceforge.net/"; + homepage = "https://invent.kde.org/sdk/kdiff3"; license = licenses.gpl2Plus; description = "Compares and merges 2 or 3 files or directories"; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2dd3d15e2af8..ac3c9727eb3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5032,7 +5032,7 @@ in krop = callPackage ../applications/graphics/krop { }; - kdiff3 = libsForQt514.callPackage ../tools/text/kdiff3 { }; + kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; kube-router = callPackage ../applications/networking/cluster/kube-router { }; From a40551cf2919a6a9fc702b0d196680e5535c9907 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 21:46:15 +0100 Subject: [PATCH 26/57] krename: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac3c9727eb3c..138a54302216 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5024,7 +5024,7 @@ in kpcli = callPackage ../tools/security/kpcli { }; - krename = libsForQt514.callPackage ../applications/misc/krename { }; + krename = libsForQt5.callPackage ../applications/misc/krename { }; krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { }; From d05f546eedd2c2aca962fb19d8b14e7c0a29dc5c Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 21:46:42 +0100 Subject: [PATCH 27/57] kronometer: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 138a54302216..6f758f413cee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5028,7 +5028,7 @@ in krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { }; - kronometer = libsForQt514.callPackage ../tools/misc/kronometer { }; + kronometer = libsForQt5.callPackage ../tools/misc/kronometer { }; krop = callPackage ../applications/graphics/krop { }; From 6d2cd35864c1ba8bc618d4788431f59fe5a3ced4 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 21:47:11 +0100 Subject: [PATCH 28/57] peruse: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f758f413cee..3729afe648c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5038,7 +5038,7 @@ in kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { }; - peruse = libsForQt514.callPackage ../tools/misc/peruse { }; + peruse = libsForQt5.callPackage ../tools/misc/peruse { }; ksmoothdock = libsForQt514.callPackage ../applications/misc/ksmoothdock { }; From b6602c1d6827882d4c6458a6003a3a3663f279ca Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 22:52:07 +0100 Subject: [PATCH 29/57] minitube: 3.2 -> 3.6 rewrite without useless wrapQtAppsHook and stdenv --- pkgs/applications/video/minitube/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index 690b8355340c..a5bd030e470c 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -1,30 +1,30 @@ -{ stdenv, fetchFromGitHub, wrapQtAppsHook, phonon, phonon-backend-vlc, qtbase, qmake +{ mkDerivation, lib, fetchFromGitHub, phonon, phonon-backend-vlc, qtbase, qmake , qtdeclarative, qttools, qtx11extras, mpv # "Free" key generated by nckx . I no longer have a Google # account. You'll need to generate (and please share :-) a new one if it breaks. , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "minitube"; - version = "3.2"; + version = "3.6"; src = fetchFromGitHub { - sha256 = "0175sgqmszakqd631bni4aqjpx68h6n49zjvg23fb1yyancnkn4c"; + sha256 = "6IaBPYL/yGWKUHxPe1FnAR1gDHImXYGItYWq7VNjwEU="; rev = version; repo = "minitube"; owner = "flaviotordini"; fetchSubmodules = true; }; - buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qttools qtx11extras mpv ]; - nativeBuildInputs = [ wrapQtAppsHook qmake ]; + buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qtx11extras mpv ]; + nativeBuildInputs = [ qmake qttools ]; qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Stand-alone YouTube video player"; longDescription = '' Watch YouTube videos in a new way: you type a keyword, Minitube gives diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3729afe648c6..2865746bc071 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22354,7 +22354,7 @@ in minishift = callPackage ../applications/networking/cluster/minishift { }; - minitube = libsForQt514.callPackage ../applications/video/minitube { }; + minitube = libsForQt5.callPackage ../applications/video/minitube { }; mimic = callPackage ../applications/audio/mimic { }; From 0ed2faf655c3a33cc8638380da3a70426f6f7a52 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 23:35:19 +0100 Subject: [PATCH 30/57] rsibreak: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2865746bc071..8cbd77e2d673 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6935,7 +6935,7 @@ in rshijack = callPackage ../tools/networking/rshijack { }; - rsibreak = libsForQt514.callPackage ../applications/misc/rsibreak { }; + rsibreak = libsForQt5.callPackage ../applications/misc/rsibreak { }; rss2email = callPackage ../applications/networking/feedreaders/rss2email { pythonPackages = python3Packages; From 0c1c70653d57620b911daaabcc78f075dd1b6895 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 23:41:14 +0100 Subject: [PATCH 31/57] birdtray: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cbd77e2d673..fd6b72521aae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1481,7 +1481,7 @@ in bindfs = callPackage ../tools/filesystems/bindfs { }; - birdtray = libsForQt514.callPackage ../applications/misc/birdtray { }; + birdtray = libsForQt5.callPackage ../applications/misc/birdtray { }; bitbucket-cli = python2Packages.bitbucket-cli; From 84ee3f63605acf744c3089cbc60bb48793176d59 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 6 Nov 2020 00:05:35 +0100 Subject: [PATCH 32/57] strawberry: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd6b72521aae..e10e8f24235a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3520,7 +3520,7 @@ in sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; - strawberry = libsForQt514.callPackage ../applications/audio/strawberry { }; + strawberry = libsForQt5.callPackage ../applications/audio/strawberry { }; tealdeer = callPackage ../tools/misc/tealdeer { inherit (darwin.apple_sdk.frameworks) Security; From 45e4e72a9ddb2bd3a1cbaffc3122112da1804da8 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 6 Nov 2020 09:32:57 +0100 Subject: [PATCH 33/57] flameshot: migrate to Qt5.15, fix homepage --- pkgs/tools/misc/flameshot/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 3dcf1e962691..988849fbbbf6 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { meta = with lib; { description = "Powerful yet simple to use screenshot software"; - homepage = "https://flameshot.js.org"; + homepage = "https://github.com/flameshot-org/flameshot"; maintainers = [ maintainers.scode ]; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e10e8f24235a..fd0e84581642 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21179,7 +21179,7 @@ in redoflacs = callPackage ../applications/audio/redoflacs { }; - flameshot = libsForQt514.callPackage ../tools/misc/flameshot { }; + flameshot = libsForQt5.callPackage ../tools/misc/flameshot { }; flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer (config.flashplayer or {}); From 984114b57a1bc23e786295989556ea0fc2e7cc79 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 6 Nov 2020 09:57:21 +0100 Subject: [PATCH 34/57] ktorrent: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd0e84581642..a488a598dad2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22002,7 +22002,7 @@ in ktimetracker = libsForQt5.callPackage ../applications/office/ktimetracker { }; - ktorrent = libsForQt514.callPackage ../applications/networking/p2p/ktorrent { }; + ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { }; kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; From 57a938aad681ddf56fdfa182fee7d963184d4ac1 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 6 Nov 2020 10:01:37 +0100 Subject: [PATCH 35/57] clipgrab: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a488a598dad2..c5edc9ed81ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20424,7 +20424,7 @@ in clightd = callPackage ../applications/misc/clight/clightd.nix { }; - clipgrab = libsForQt514.callPackage ../applications/video/clipgrab { }; + clipgrab = libsForQt5.callPackage ../applications/video/clipgrab { }; clipcat = callPackage ../applications/misc/clipcat { }; From 8a2a835f22e732de2207ffe7c0dc2a084cb9fcef Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 6 Nov 2020 11:41:26 +0100 Subject: [PATCH 36/57] sonic-lineup: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5edc9ed81ae..afe5dba0519c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23702,7 +23702,7 @@ in soci = callPackage ../development/libraries/soci { }; - sonic-lineup = libsForQt514.callPackage ../applications/audio/sonic-lineup { }; + sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { }; sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { }; From b492fd43062b8dbdaf5f60e28fb0dd7fbd8a9860 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 6 Nov 2020 14:51:23 +0100 Subject: [PATCH 37/57] skrooge: migrate to Qt5.15, enable tests --- pkgs/applications/office/skrooge/default.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index e84e84967419..067b06747d77 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -30,6 +30,7 @@ mkDerivation rec { cmakeFlags = [ "-DSKG_DESIGNER=OFF" "-DSKG_WEBENGINE=ON" + "-DBUILD_TESTS=ON" ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afe5dba0519c..df125481556a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23682,7 +23682,7 @@ in robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; - skrooge = libsForQt514.callPackage ../applications/office/skrooge {}; + skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; smartgithg = callPackage ../applications/version-management/smartgithg { jre = openjdk11; From be86d67202bc9b02a3639eab7a8f36846f146cba Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 6 Nov 2020 17:02:50 +0100 Subject: [PATCH 38/57] skanlite: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df125481556a..388bd2fa8073 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23698,7 +23698,7 @@ in sipp = callPackage ../development/tools/misc/sipp { }; - skanlite = libsForQt514.callPackage ../applications/office/skanlite { }; + skanlite = libsForQt5.callPackage ../applications/office/skanlite { }; soci = callPackage ../development/libraries/soci { }; From cec5b4d18b61b4f1a78c3f624ff926eda8c4470e Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 7 Nov 2020 12:32:26 +0100 Subject: [PATCH 39/57] cutecom: fix build with Qt5.15 Used a dangling commit on upstream master branch as it was not released and the patch was submitted to opensuse instead of upstream --- pkgs/tools/misc/cutecom/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix index d825b555e195..e109b12f2879 100644 --- a/pkgs/tools/misc/cutecom/default.nix +++ b/pkgs/tools/misc/cutecom/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "cutecom"; - version = "0.51.0"; + version = "0.51.0+patch"; src = fetchFromGitLab { owner = "cutecom"; repo = "cutecom"; - rev = "v${version}"; - sha256 = "1zprabjs4z26hsb64fc3k790aiiqiz9d88j666xrzi4983m1bfv8"; + rev = "70d0c497acf8f298374052b2956bcf142ed5f6ca"; + sha256 = "X8jeESt+x5PxK3rTNC1h1Tpvue2WH09QRnG2g1eMoEE="; }; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 388bd2fa8073..0af612780d29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20521,7 +20521,7 @@ in curseradio = callPackage ../applications/audio/curseradio { }; - cutecom = libsForQt514.callPackage ../tools/misc/cutecom { }; + cutecom = libsForQt5.callPackage ../tools/misc/cutecom { }; cvs = callPackage ../applications/version-management/cvs { }; From c99a4f92ac2ebe02590e3849acdb4410066e69c1 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 7 Nov 2020 12:35:30 +0100 Subject: [PATCH 40/57] libsForQt5.herqq: fix build with qt5.15 Using a unreleased commit from upstream. Also moved the derivation to mkLibsForQt5 to let the application choose its Qt5 version. Did not put an alias as previous version was broken since ages. --- pkgs/development/libraries/herqq/default.nix | 17 +++++++++-------- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix index 8dc0df3a9f2f..265289f06f38 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/development/libraries/herqq/default.nix @@ -1,25 +1,26 @@ -{ stdenv, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }: +{ lib, mkDerivation, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }: -stdenv.mkDerivation rec { - version = "2.1.0"; +mkDerivation rec { + version = "unstable-20-06-26"; pname = "herqq"; nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase unzip qtmultimedia ]; - preConfigure = "cd herqq"; + outputs = [ "out" "dev" ]; + + sourceRoot = "source/herqq"; src = fetchFromGitHub { owner = "ThomArmax"; repo = "HUPnP"; - rev = version; - sha256 = "1w674rbwbhpirq70gp9rk6p068j36rwn112fx3nz613wgw63x84m"; + rev = "c8385a8846b52def7058ae3794249d6b566a41fc"; + sha256 = "FxN/QlLB3sZ6Vn/9VIKNUntX/B4+crQZ7t760pwFqY8="; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://herqq.org"; description = "A software library for building UPnP devices and control points"; platforms = platforms.linux; maintainers = [ ]; - broken = true; # 2018-09-21, built with qt510 (which was removed) but neither qt59 nor qt511 }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0af612780d29..2e03c6b6d5e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15380,6 +15380,8 @@ in grantlee = callPackage ../development/libraries/grantlee/5 { }; + herqq = callPackage ../development/libraries/herqq { }; + kdb = callPackage ../development/libraries/kdb { }; kdiagram = callPackage ../development/libraries/kdiagram { }; From a62425888cca030ffad643f0df695909f281efab Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 7 Nov 2020 12:38:12 +0100 Subject: [PATCH 41/57] p4v: comment why it is broken with Qt5.15 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e03c6b6d5e1..12ab5e320296 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22618,6 +22618,7 @@ in }; p4 = callPackage ../applications/version-management/p4 { }; + # Broken with Qt5.15 because qtwebkit is broken with it p4v = libsForQt514.callPackage ../applications/version-management/p4v { }; partio = callPackage ../development/libraries/partio {}; From e4aa0e093604d38d8c1dd8f4f8590da024a8ac52 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 7 Nov 2020 12:39:22 +0100 Subject: [PATCH 42/57] ostinato: 0.9 -> 1.1 * Port to Qt5.15 in the process * Cleanup the derivation to use new style --- .../networking/ostinato/default.nix | 22 +++++++++++-------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index aa9d94ad5b6e..3bfb2526232c 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchFromGitHub, fetchurl, qmake4Hook, makeDesktopItem -, qt4, protobuf, libpcap, wireshark, gzip, diffutils, gawk +{ lib, mkDerivation, fetchFromGitHub, fetchurl, qmake, makeDesktopItem +, qtbase, qtscript, protobuf, libpcap, wireshark, gzip, diffutils, gawk +, libnl }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "ostinato"; - version = "0.9"; + version = "1.1"; src = fetchFromGitHub { owner = "pstavirs"; repo = "ostinato"; rev = "v${version}"; - sha256 = "109gxj6djdsk7rp1nxpx39kfi75xfl9p9qgffh1cpcdpbsbvq5bx"; + sha256 = "0B3jOj5rA3/rD2gXS2praZImeP34zN06fOPy/IswXOg="; }; ostinatoIcon = fetchurl { @@ -18,14 +19,17 @@ stdenv.mkDerivation rec { sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70"; }; - buildInputs = [ qt4 protobuf libpcap ]; + buildInputs = [ qtbase protobuf libpcap qtscript libnl ]; - nativeBuildInputs = [ qmake4Hook ]; + nativeBuildInputs = [ qmake ]; patches = [ ./drone_ini.patch ]; + prePatch = '' + sed -i 's|/usr/include/libnl3|${libnl.dev}/include/libnl3|' server/drone.pro + ''; desktopItem = makeDesktopItem { - type = "application"; + type = "Application"; name = "ostinato"; desktopName = "Ostinato"; genericName = "Packet/Traffic Generator and Analyzer"; @@ -58,7 +62,7 @@ stdenv.mkDerivation rec { # pdmlprotocol.h:23:25: fatal error: protocol.pb.h: No such file or directory enableParallelBuilding = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A packet traffic generator and analyzer"; homepage = "https://ostinato.org"; license = licenses.gpl3; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12ab5e320296..2c33df41ef3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22613,9 +22613,7 @@ in osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; - ostinato = callPackage ../applications/networking/ostinato { - wireshark = wireshark.override { qt5 = qt514; }; - }; + ostinato = libsForQt5.callPackage ../applications/networking/ostinato { }; p4 = callPackage ../applications/version-management/p4 { }; # Broken with Qt5.15 because qtwebkit is broken with it From c173f416e03cbad7fa50583fa6d678683cdc702f Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 7 Nov 2020 12:47:41 +0100 Subject: [PATCH 43/57] libsForQt5.kde2-decoration: 1.0 -> 1.1 Fixes build for Qt5.15 Split output to mutilple outputs to reduce user closure size --- pkgs/data/themes/kde2/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/data/themes/kde2/default.nix b/pkgs/data/themes/kde2/default.nix index 547e4f30aa6c..7e33d371ebeb 100644 --- a/pkgs/data/themes/kde2/default.nix +++ b/pkgs/data/themes/kde2/default.nix @@ -5,15 +5,16 @@ mkDerivation rec { pname = "kde2-decoration"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "repos-holder"; repo = "kdecoration2-kde2"; rev = version; - sha256 = "1766z9wscybcqvr828xih93b3rab3hb0ghsf818iflhp1xy0js08"; + sha256 = "y2q1j36EURJc7k1huqhEH1Z82PnVSKlfx20bpQWY28c="; }; + outputs = [ "out" "dev" ]; enableParallelBuilding = true; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c33df41ef3b..76c4038ba8ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15384,6 +15384,8 @@ in kdb = callPackage ../development/libraries/kdb { }; + kde2-decoration = callPackage ../data/themes/kde2 { }; + kdiagram = callPackage ../development/libraries/kdiagram { }; kdsoap = callPackage ../development/libraries/kdsoap { }; @@ -19438,8 +19440,6 @@ in kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; - kde2-decoration = libsForQt514.callPackage ../data/themes/kde2 { }; - kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; From ecf4fd16b941aea44e16b9821b36996d3c9e00dd Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 7 Nov 2020 12:49:06 +0100 Subject: [PATCH 44/57] retroshare: move to alias and explain why it is broken --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3731cf64f778..2682f6c062f3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -487,6 +487,7 @@ mapAliases ({ rssglx = rss-glx; #added 2015-03-25 rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # added 2020-08-25 recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 + retroshare06 = retroshare; gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 rfkill = throw "rfkill has been removed, as it's included in utillinux"; # added 2020-08-23 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76c4038ba8ea..76e258fbf8b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23426,8 +23426,9 @@ in remotebox = callPackage ../applications/virtualization/remotebox { }; - retroshare = libsForQt514.callPackage ../applications/networking/p2p/retroshare { }; - retroshare06 = retroshare; + # This package is currently broken with libupnp + # But when unbroken, it should work with the stable Qt5 + retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { }; rgp = libsForQt5.callPackage ../development/tools/rgp { }; From bb18d1dcf1a7df66d69b38da5448fdebeec5e02c Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 7 Nov 2020 12:50:11 +0100 Subject: [PATCH 45/57] sigil: migrate to Qt5.15 and fix segfault --- pkgs/applications/editors/sigil/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 869c20c1d6c4..eb026f6dca3a 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -24,6 +24,10 @@ mkDerivation rec { python3Packages.lxml ]; + prePatch = '' + sed -i '/^QTLIB_DIR=/ d' src/Resource_Files/bash/sigil-sh_install + ''; + dontWrapQtApps = true; preFixup = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76e258fbf8b2..53129559d07f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7159,7 +7159,7 @@ in sigal = callPackage ../applications/misc/sigal { }; - sigil = libsForQt514.callPackage ../applications/editors/sigil { }; + sigil = libsForQt5.callPackage ../applications/editors/sigil { }; signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { }; From 38b041bdf8ee4ffe9861b44dec181f75f13e8f17 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 7 Nov 2020 13:10:39 +0100 Subject: [PATCH 46/57] libsForQt5.qtcurve: fix build with Qt5.15 moved the initial qtcurve package to mkLibsForQt5 function to decouple from Qt5 version added an alias qtcurve -> libsForQt5.qtcurve for backward compatibility add option to disable gtk2 support (still enabled by default) --- pkgs/data/themes/qtcurve/default.nix | 33 ++++++++++++++++++---------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix index 719b1ce1a487..cd5cb4170b8c 100644 --- a/pkgs/data/themes/qtcurve/default.nix +++ b/pkgs/data/themes/qtcurve/default.nix @@ -1,43 +1,47 @@ -{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, mkDerivation -, gtk2, qtbase, qtsvg, qtx11extras # Toolkit dependencies +{ lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, mkDerivation +, gtk2Support ? true, gtk2 +, qtbase, qtsvg, qtx11extras # Toolkit dependencies , karchive, kconfig, kconfigwidgets, kio, frameworkintegration , kguiaddons, ki18n, kwindowsystem, kdelibs4support, kiconthemes , libpthreadstubs, pcre, libXdmcp, libX11, libXau # X11 dependencies , fetchpatch }: -let - version = "1.9.1"; -in mkDerivation { +mkDerivation rec { pname = "qtcurve"; - inherit version; + version = "1.9.1"; src = fetchFromGitHub { owner = "KDE"; repo = "qtcurve"; rev = version; - sha256 = "0sm1fza68mwl9cvid4h2lsyxq5svia86l5v9wqk268lmx16mbzsw"; + sha256 = "XP9VTeiVIiMm5mkXapCKWxfcvaYCkhY3S5RXZNR3oWo="; }; + enableParallelBuilding = true; + patches = [ + # Remove unnecessary constexpr, this is not allowed in C++14 (fetchpatch { url = "https://github.com/KDE/qtcurve/commit/ee2228ea2f18ac5da9b434ee6089381df815aa94.patch"; sha256 = "1vz5frsrsps93awn84gk8d7injrqfcyhc1rji6s0gsgsp5z9sl34"; }) + # Fix build with Qt5.15 + (fetchpatch { + url = "https://github.com/KDE/qtcurve/commit/44e2a35ebb164dcab0bad1a9158b1219a3ff6504.patch"; + sha256 = "5I2fTxKRJX0cJcyUvYHWZx369FKk6ti9Se7AfYmB9ek="; + }) ]; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; buildInputs = [ - gtk2 qtbase qtsvg qtx11extras karchive kconfig kconfigwidgets kio kiconthemes kguiaddons ki18n kwindowsystem kdelibs4support frameworkintegration libpthreadstubs pcre libXdmcp libX11 libXau - ]; + ] ++ lib.optional gtk2Support gtk2; preConfigure = '' for i in qt5/CMakeLists.txt qt5/config/CMakeLists.txt @@ -52,7 +56,12 @@ in mkDerivation { patchShebangs tools/gen-version.sh ''; - meta = with stdenv.lib; { + configureFlags = [ + "-DENABLE_GTK2=${if gtk2Support then "ON" else "OFF"}" + "-DENABLE_QT4=OFF" + ]; + + meta = with lib; { homepage = "https://github.com/QtCurve/qtcurve"; description = "Widget styles for Qt5/Plasma 5 and gtk2"; platforms = platforms.linux; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2682f6c062f3..078d4bc2eca4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -475,6 +475,7 @@ mapAliases ({ quake3game = ioquake3; # added 2016-01-14 qvim = throw "qvim has been removed."; # added 2020-08-31 qwt6 = libsForQt5.qwt; # added 2015-12-19 + qtcurve = libsForQt5.qtcurve; # added 2020-11-07 qtpfsgui = throw "qtpfsgui is now luminanceHDR"; # added 2019-06-26 quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09 rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53129559d07f..206e1f8de118 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15380,6 +15380,8 @@ in grantlee = callPackage ../development/libraries/grantlee/5 { }; + qtcurve = callPackage ../data/themes/qtcurve {}; + herqq = callPackage ../development/libraries/herqq { }; kdb = callPackage ../development/libraries/kdb { }; @@ -19692,8 +19694,6 @@ in qogir-theme = callPackage ../data/themes/qogir { }; - qtcurve = libsForQt514.callPackage ../data/themes/qtcurve {}; - redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; route159 = callPackage ../data/fonts/route159 { }; From b203a64cc3e530651f754d9bd0fed0d960e3bb57 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 9 Nov 2020 17:17:37 +0200 Subject: [PATCH 47/57] kmymoney: pin to qt5.14 --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 206e1f8de118..7c92e423bbc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21982,7 +21982,8 @@ in kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; - kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { }; + # Pinned to qt5.14 due to kdewebkit (depends on qtwebkit) which is currently broken with qt5.15 + kmymoney = libsForQt514.callPackage ../applications/office/kmymoney { }; kodestudio = callPackage ../applications/editors/kodestudio { }; From 3b4598feb46a0103f00b4fd8e3e15728b2b2fa44 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 10 Nov 2020 19:04:13 +0200 Subject: [PATCH 48/57] mendeley: comment why it needs qt5.14 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c92e423bbc4..3c08f0876b37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22313,6 +22313,7 @@ in meme = callPackage ../applications/graphics/meme { }; + # Needs qtwebkit which is broken on qt5.15 mendeley = libsForQt514.callPackage ../applications/office/mendeley { gconf = pkgs.gnome2.GConf; }; From c240827cbe9c2dc067621faff1f30fb7f30f79fd Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 10 Nov 2020 19:07:51 +0200 Subject: [PATCH 49/57] merkaator: comment why it needs qt5.14 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c08f0876b37..22a15d26d66b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22329,6 +22329,7 @@ in mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); + # Needs qtwebkit which is broken on qt5.15 merkaartor = libsForQt514.callPackage ../applications/misc/merkaartor { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; From 28ea56deb992658211fda3514e7954b2b4ce91d7 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 13 Nov 2020 20:30:26 +0100 Subject: [PATCH 50/57] amarok: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22a15d26d66b..3f5c6529ceac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20023,7 +20023,7 @@ in msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { }; - amarok = libsForQt514.callPackage ../applications/audio/amarok { }; + amarok = libsForQt5.callPackage ../applications/audio/amarok { }; amarok-kf5 = amarok; # for compatibility amfora = callPackage ../applications/networking/browsers/amfora { }; From 78e3620fdc727162e4445656d48566f614bd8ec9 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 13 Nov 2020 20:30:50 +0100 Subject: [PATCH 51/57] communi: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f5c6529ceac..6c6f15265bc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20455,7 +20455,7 @@ in cntr = callPackage ../applications/virtualization/cntr { }; - communi = libsForQt514.callPackage ../applications/networking/irc/communi { }; + communi = libsForQt5.callPackage ../applications/networking/irc/communi { }; confclerk = callPackage ../applications/misc/confclerk { }; From df3065a7efefaa1fdfb8cf2c81d03e52eb5272ed Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 13 Nov 2020 20:31:08 +0100 Subject: [PATCH 52/57] csound-qt: migrate to Qt5.15 Did not touch the dependency to python27 but may require another PR --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c6f15265bc9..79a91aa0cd63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20478,7 +20478,7 @@ in pygments = python27Packages.pygments; }; - csound-qt = libsForQt514.callPackage ../applications/audio/csound/csound-qt { + csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { python = python27; }; From d63a3895afd868f3c339518fdca94117368a7b2d Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 13 Nov 2020 20:36:41 +0100 Subject: [PATCH 53/57] fritzing: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79a91aa0cd63..ba7f3f4d7142 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20961,7 +20961,7 @@ in freewheeling = callPackage ../applications/audio/freewheeling { }; - fritzing = libsForQt514.callPackage ../applications/science/electronics/fritzing { }; + fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { }; fsv = callPackage ../applications/misc/fsv { }; From 2bdac39fdaf6df6739243d7e7c4c81a55e0cdfd4 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 13 Nov 2020 20:37:12 +0100 Subject: [PATCH 54/57] kgraphviewer: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba7f3f4d7142..94cb5f46e212 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21959,7 +21959,7 @@ in keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { }; - kgraphviewer = libsForQt514.callPackage ../applications/graphics/kgraphviewer { }; + kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { }; khal = callPackage ../applications/misc/khal { }; From c604e61cf8610c599017a6faaf06e12760f5ec43 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 13 Nov 2020 20:37:46 +0100 Subject: [PATCH 55/57] luminanceHDR: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94cb5f46e212..4ac393e98251 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22192,7 +22192,7 @@ in lsp-plugins = callPackage ../applications/audio/lsp-plugins { }; - luminanceHDR = libsForQt514.callPackage ../applications/graphics/luminance-hdr { }; + luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { }; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; From 5c2d391f7366176a0d2dbe46d584c5b71432d3d6 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 13 Nov 2020 20:38:07 +0100 Subject: [PATCH 56/57] rssguard: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ac393e98251..bdbcb00a8608 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22681,7 +22681,7 @@ in qbec = callPackage ../applications/networking/cluster/qbec { }; - rssguard = libsForQt514.callPackage ../applications/networking/feedreaders/rssguard { }; + rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; From 8b0dee1dc67ebbd16aefdaf0015503b1c8de2e84 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 13 Nov 2020 20:38:52 +0100 Subject: [PATCH 57/57] obs-studio,obs-v4l2sink: migrate to Qt5.15 obs-nvi was not touched but should be modified as well, it requires a custom download that I don't use, so I prefer to let official maintainer do it. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdbcb00a8608..601b9e2bedf3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22853,13 +22853,13 @@ in inherit (gnome2) libglade; }; - obs-studio = libsForQt514.callPackage ../applications/video/obs-studio { }; + obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { }; obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; obs-move-transition = callPackage ../applications/video/obs-studio/obs-move-transition.nix { }; - obs-v4l2sink = libsForQt514.callPackage ../applications/video/obs-studio/v4l2sink.nix { }; + obs-v4l2sink = libsForQt5.callPackage ../applications/video/obs-studio/v4l2sink.nix { }; obs-ndi = libsForQt514.callPackage ../applications/video/obs-studio/obs-ndi.nix { };