Merge pull request #102840 from freezeboy/update-fixes

treewide: Qt5.X -> Qt5.15 (when possible)
This commit is contained in:
Jonathan Ringer 2020-11-20 14:09:26 -08:00 committed by GitHub
commit f0aac91187
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 240 additions and 256 deletions

View File

@ -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;

View File

@ -24,6 +24,10 @@ mkDerivation rec {
python3Packages.lxml
];
prePatch = ''
sed -i '/^QTLIB_DIR=/ d' src/Resource_Files/bash/sigil-sh_install
'';
dontWrapQtApps = true;
preFixup = ''

View File

@ -1,19 +0,0 @@
commit e92b250968e9656084ab5984689747ca615ff6e7
Author: Volker Wichmann <wichmann@laserdata.at>
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();

View File

@ -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;

View File

@ -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

View File

@ -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\

View File

@ -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;
};
}

View File

@ -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 ];

View File

@ -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;

View File

@ -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;
};
}

View File

@ -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;

View File

@ -30,6 +30,7 @@ mkDerivation rec {
cmakeFlags = [
"-DSKG_DESIGNER=OFF"
"-DSKG_WEBENGINE=ON"
"-DBUILD_TESTS=ON"
];
meta = with lib; {

View File

@ -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 ];

View File

@ -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"

View File

@ -27,7 +27,6 @@ mkDerivation {
nativeBuildInputs = [
cmake
wrapQtAppsHook
];
buildInputs = [

View File

@ -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;

View File

@ -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 <github@tobias.gr>. 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

View File

@ -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 ];

View File

@ -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=";
};
}

View File

@ -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/";

View File

@ -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 ];

View File

@ -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;

View File

@ -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
};
}

View File

@ -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;

View File

@ -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;

View File

@ -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 = ''

View File

@ -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 ];

View File

@ -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 = ''

View File

@ -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;

View File

@ -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 ];

View File

@ -471,9 +471,11 @@ 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
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
@ -486,6 +488,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

View File

@ -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;
@ -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;
@ -5024,21 +5024,21 @@ 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 { };
kronometer = libsForQt514.callPackage ../tools/misc/kronometer { };
kronometer = libsForQt5.callPackage ../tools/misc/kronometer { };
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 { };
kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { };
peruse = libsForQt514.callPackage ../tools/misc/peruse { };
peruse = libsForQt5.callPackage ../tools/misc/peruse { };
ksmoothdock = libsForQt514.callPackage ../applications/misc/ksmoothdock { };
@ -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 { };
@ -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;
@ -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 { };
@ -15380,8 +15380,14 @@ in
grantlee = callPackage ../development/libraries/grantlee/5 { };
qtcurve = callPackage ../data/themes/qtcurve {};
herqq = callPackage ../development/libraries/herqq { };
kdb = callPackage ../development/libraries/kdb { };
kde2-decoration = callPackage ../data/themes/kde2 { };
kdiagram = callPackage ../development/libraries/kdiagram { };
kdsoap = callPackage ../development/libraries/kdsoap { };
@ -15446,6 +15452,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;
};
@ -19434,8 +19442,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 {};
@ -19688,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 { };
@ -20019,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 { };
@ -20422,7 +20426,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 { };
@ -20451,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 { };
@ -20474,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;
};
@ -20519,7 +20523,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 { };
@ -20957,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 { };
@ -21177,7 +21181,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 {});
@ -21957,7 +21961,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 { };
@ -21980,7 +21984,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 { };
@ -22002,7 +22007,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 { };
@ -22189,7 +22194,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 { };
@ -22310,6 +22315,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;
};
@ -22325,6 +22331,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 { };
@ -22354,7 +22361,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 { };
@ -22611,11 +22618,10 @@ 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
p4v = libsForQt514.callPackage ../applications/version-management/p4v { };
partio = callPackage ../development/libraries/partio {};
@ -22677,7 +22683,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 { };
@ -22849,13 +22855,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 { };
@ -23171,7 +23177,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 { };
@ -23179,9 +23185,9 @@ 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 { };
psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { };
psol = callPackage ../development/libraries/psol { };
@ -23425,8 +23431,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 { };
@ -23682,7 +23689,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;
@ -23698,11 +23705,11 @@ in
sipp = callPackage ../development/tools/misc/sipp { };
skanlite = libsForQt514.callPackage ../applications/office/skanlite { };
skanlite = libsForQt5.callPackage ../applications/office/skanlite { };
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 { };
@ -23877,7 +23884,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;
@ -24214,7 +24221,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;
};
@ -24376,7 +24383,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 {};
@ -24914,7 +24921,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 { };
@ -25157,7 +25164,7 @@ in
chessx = libsForQt5.callPackage ../games/chessx { };
chiaki = libsForQt514.callPackage ../games/chiaki { };
chiaki = libsForQt5.callPackage ../games/chiaki { };
chocolateDoom = callPackage ../games/chocolate-doom { };
@ -25601,7 +25608,7 @@ in
papermc = callPackage ../games/papermc { };
pentobi = libsForQt514.callPackage ../games/pentobi { };
pentobi = libsForQt5.callPackage ../games/pentobi { };
performous = callPackage ../games/performous {
boost = boost166;
@ -25686,11 +25693,11 @@ in
rrootage = callPackage ../games/rrootage { };
saga = libsForQt514.callPackage ../applications/gis/saga {
saga = libsForQt5.callPackage ../applications/gis/saga {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
samplv1 = callPackage ../applications/audio/samplv1 { qt5 = qt514; };
samplv1 = libsForQt5.callPackage ../applications/audio/samplv1 { };
sauerbraten = callPackage ../games/sauerbraten {};
@ -26591,7 +26598,7 @@ in
xfitter = callPackage ../applications/science/physics/xfitter {};
xflr5 = libsForQt514.callPackage ../applications/science/physics/xflr5 { };
xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { };
### SCIENCE/PROGRAMMING
@ -26820,7 +26827,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.
@ -26829,7 +26836,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 { };
@ -26872,8 +26879,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 { };
@ -27149,7 +27154,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 { };
@ -27948,7 +27953,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 {};
@ -27999,7 +28004,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 { };
@ -28314,7 +28319,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 { };