From a643b3a013f6e07501a50226eabf1a57b1210e2a Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 12 Dec 2020 11:06:27 +0100 Subject: [PATCH 1/7] herqq: 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 df1e8fdd040..f47c9fa28cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13601,7 +13601,7 @@ in hdt = callPackage ../misc/hdt {}; - herqq = libsForQt514.callPackage ../development/libraries/herqq { }; + herqq = libsForQt5.callPackage ../development/libraries/herqq { }; hidapi = callPackage ../development/libraries/hidapi { # TODO: remove once `udev` is `systemdMinimal` everywhere. From 30db607680deaa0ef171a6e3e2c965d939a1102f Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 12 Dec 2020 11:26:11 +0100 Subject: [PATCH 2/7] bibletime: 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 f47c9fa28cf..ef2ce6d6150 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20722,7 +20722,7 @@ in bevelbar = callPackage ../applications/window-managers/bevelbar { }; - bibletime = libsForQt514.callPackage ../applications/misc/bibletime { }; + bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; bino3d = libsForQt5.callPackage ../applications/video/bino3d { glew = glew110; From 60687e3634f833d826caaaaf2abf4fd4b6f56058 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 12 Dec 2020 11:35:33 +0100 Subject: [PATCH 3/7] dfilemanager: git-2016-01-10 -> git-2020-09-04 --- pkgs/applications/misc/dfilemanager/default.nix | 17 ++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 69c7f0dc17f..44e9fe88283 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -1,15 +1,14 @@ -{ stdenv, mkDerivation, fetchgit, cmake, file, qtbase, qttools, solid }: +{ stdenv, mkDerivation, fetchFromGitHub, cmake, file, qtbase, qttools, solid }: -let - version = "git-2016-01-10"; -in mkDerivation { pname = "dfilemanager"; - inherit version; - src = fetchgit { - url = "git://git.code.sf.net/p/dfilemanager/code"; - rev = "2c5078b05e0ad74c037366be1ab3e6a03492bde4"; - sha256 = "1qwhnlcc2j8sr1f3v63sxs3m7q7w1xy6c2jqsnznjgm23b5h3hxd"; + version = "git-2020-09-04"; + + src = fetchFromGitHub { + owner = "probonopd"; + repo = "dfilemanager"; + rev = "c592d643d76942dc2c2ccb6e4bfdf53f5e805e48"; + sha256 = "7hIgaWjjOck5i4QbeVeQK7yrjK4yDoAZ5qY9RhM5ABY="; }; buildInputs = [ cmake qtbase qttools file solid ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef2ce6d6150..5e71efaf84d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21080,7 +21080,7 @@ in dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; - dfilemanager = libsForQt514.callPackage ../applications/misc/dfilemanager { }; + dfilemanager = libsForQt5.callPackage ../applications/misc/dfilemanager { }; dia = callPackage ../applications/graphics/dia { inherit (pkgs.gnome2) libart_lgpl libgnomeui; From e526a4f72dc9b7c5a9ef458e65b5218db1611839 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 12 Dec 2020 11:47:48 +0100 Subject: [PATCH 4/7] mindforger: 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 5e71efaf84d..13b9b68b091 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21912,7 +21912,7 @@ in manul = callPackage ../development/tools/manul { }; - mindforger = libsForQt514.callPackage ../applications/editors/mindforger { }; + mindforger = libsForQt5.callPackage ../applications/editors/mindforger { }; mi2ly = callPackage ../applications/audio/mi2ly {}; From bc797e287ab67e1bb11839330aab8327cae85cd5 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 12 Dec 2020 12:25:00 +0100 Subject: [PATCH 5/7] merkaator: unstable-2019-11-12 -> 0.18.4 --- pkgs/applications/misc/merkaartor/default.nix | 28 ++++++++++--------- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 79ee45b4c1c..e73805f67b3 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchFromGitHub, makeWrapper, qmake, pkgconfig, boost, gdal, proj -, qtbase, qtsvg, qtwebview, qtwebkit }: +{ mkDerivation, lib, fetchFromGitHub, qmake, pkgconfig, fetchpatch +, boost, gdal, proj, qtbase, qtsvg, qtwebview, qtwebkit }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "merkaartor"; - version = "unstable-2019-11-12"; + version = "0.18.4"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "merkaartor"; - rev = "29b3388680a03f1daac0037a2b504ea710da879a"; - sha256 = "0h3d3srzl06p2ajq911j05zr4vkl88qij18plydx45yqmvyvh0xz"; + rev = version; + sha256 = "vwO4/a7YF9KbpxcFGTFCdG6SfwEyhISlEtcA+rMebUA="; }; - nativeBuildInputs = [ makeWrapper qmake pkgconfig ]; + patches = [ + (fetchpatch { + url = "https://github.com/openstreetmap/merkaartor/commit/e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c.patch"; + sha256 = "NAisplnS3xHSlRpX+fH15NpbaD+uM57OCsTYGKlIR7U="; + }) + ]; + + nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ boost gdal proj qtbase qtsvg qtwebview qtwebkit ]; @@ -20,12 +27,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; - postInstall = '' - wrapProgram $out/bin/merkaartor \ - --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "OpenStreetMap editor"; homepage = "http://merkaartor.be/"; license = licenses.gpl2Plus; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13b9b68b091..8cf7279fbdd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22946,8 +22946,7 @@ in mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); - # Needs qtwebkit which is broken on qt5.15 - merkaartor = libsForQt514.callPackage ../applications/misc/merkaartor { }; + merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; From 16ec307c2177812be2b74ca23361bebb39372fe6 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 12 Dec 2020 12:25:45 +0100 Subject: [PATCH 6/7] seafile-shared,seafile-client: 7.0.9 -> 8.0.1 This allows to migrate the dependencies to python3 and qt5.15 --- .../networking/seafile-client/default.nix | 6 ++-- pkgs/misc/seafile-shared/default.nix | 34 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 83f15b54fa7..fb0c0a18ac5 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "seafile-client"; - version = "7.0.10"; + version = "8.0.1"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; - rev = "v${version}"; - sha256 = "082v1qbysrqb7m0lk56fpx8n403fjxbvbj0svm4mkjl6mzs2cv22"; + rev = "b4b944921c7efef13a93d693c45c997943899dec"; + sha256 = "2vV+6ZXjVg81JVLfWeD0UK+RdmpBxBU2Ozx790WFSyw="; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 385f2f3cc13..0d911cd35c1 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -1,22 +1,38 @@ -{stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, vala, python2, curl, libevent, glib, libsearpc, sqlite, intltool, fuse, libuuid }: +{ stdenv +, fetchFromGitHub +, autoreconfHook +, ccnet +, curl +, fuse +, glib +, intltool +, libevent +, libsearpc +, libuuid +, pkg-config +, python3 +, sqlite +, vala +, which +}: stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "7.0.10"; + version = "8.0.1"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; - rev = "v${version}"; - sha256 = "0b3297cbagi9x8dnw2gjifmb8dk6vyhg6vfrfsanm1wyx8pgw2jg"; + rev = "d34499a2aafa024623a4210fe7f663cef13fe9a6"; + sha256 = "VKoGr3CTDFg3Q0X+MTlwa4BbfLB+28FeTyTJRCq37RA="; }; nativeBuildInputs = [ autoreconfHook vala - pkgconfig - python2 - python2.pkgs.wrapPython + pkg-config + python3 + python3.pkgs.wrapPython ]; buildInputs = [ @@ -30,10 +46,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-server" "--disable-console" + "--with-python3" ]; - pythonPath = with python2.pkgs; [ - future + pythonPath = with python3.pkgs; [ libsearpc ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cf7279fbdd..e53ffce6060 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24155,7 +24155,7 @@ in scribusUnstable = libsForQt5.callPackage ../applications/office/scribus/unstable.nix { }; - seafile-client = libsForQt514.callPackage ../applications/networking/seafile-client { }; + seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; sent = callPackage ../applications/misc/sent { }; From 7aaadab55cee03a7e25e70238dfb503e77dcd156 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 12 Dec 2020 13:47:37 +0100 Subject: [PATCH 7/7] solarus,solarus-quest-editor: migrate to Qt5.15 --- .../tools/solarus-quest-editor/default.nix | 19 +++++++++++++------ pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix index d44622e7e59..8b0518f09eb 100644 --- a/pkgs/development/tools/solarus-quest-editor/default.nix +++ b/pkgs/development/tools/solarus-quest-editor/default.nix @@ -1,7 +1,7 @@ -{ lib, mkDerivation, fetchFromGitLab, cmake, luajit, - SDL2, SDL2_image, SDL2_ttf, physfs, - openal, libmodplug, libvorbis, solarus, - qtbase, qttools, glm }: +{ lib, mkDerivation, fetchFromGitLab, cmake, luajit +, SDL2, SDL2_image, SDL2_ttf, physfs, fetchpatch +, openal, libmodplug, libvorbis, solarus +, qtbase, qttools, glm }: mkDerivation rec { pname = "solarus-quest-editor"; @@ -13,7 +13,14 @@ mkDerivation rec { rev = "v${version}"; sha256 = "1qbc2j9kalk7xqk9j27s7wnm5zawiyjs47xqkqphw683idmzmjzn"; }; - + + patches = [ + (fetchpatch { + url = "https://gitlab.com/solarus-games/solarus-quest-editor/-/commit/81d5c7f1602cf355684d70a5e3449fefccfc44b8.patch"; + sha256 = "tVUxkkDp2PcOHGy4dGvUcYj9gF7k4LN21VuxohCw9NE="; + }) + ]; + buildInputs = [ cmake luajit SDL2 SDL2_image SDL2_ttf physfs openal libmodplug libvorbis @@ -31,5 +38,5 @@ mkDerivation rec { maintainers = [ maintainers.Nate-Devv ]; platforms = platforms.linux; }; - + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e53ffce6060..f4730ddceb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26436,8 +26436,8 @@ in }; # solarus and solarus-quest-editor must use the same version of Qt. - solarus = libsForQt514.callPackage ../games/solarus { }; - solarus-quest-editor = libsForQt514.callPackage ../development/tools/solarus-quest-editor { }; + solarus = libsForQt5.callPackage ../games/solarus { }; + solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { }; # You still can override by passing more arguments. space-orbit = callPackage ../games/space-orbit { };