From 5e55ebb2b40910a970a8562c1ab434e47f8dc838 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Wed, 26 Feb 2020 13:54:00 +0100 Subject: [PATCH 1/3] megasync: format with nixfmt --- pkgs/applications/misc/megasync/default.nix | 78 +++++++-------------- 1 file changed, 25 insertions(+), 53 deletions(-) diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index 6e51e3cda762..5de4cb002dcd 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -1,28 +1,6 @@ -{ stdenv -, autoconf -, automake -, c-ares -, cryptopp -, curl -, doxygen -, fetchFromGitHub -, ffmpeg -, libmediainfo -, libraw -, libsodium -, libtool -, libuv -, libzen -, lsb-release -, mkDerivation -, pkgconfig -, qtbase -, qttools -, sqlite -, swig -, unzip -, wget -}: +{ stdenv, autoconf, automake, c-ares, cryptopp, curl, doxygen, fetchFromGitHub +, ffmpeg, libmediainfo, libraw, libsodium, libtool, libuv, libzen, lsb-release +, mkDerivation, pkgconfig, qtbase, qttools, sqlite, swig, unzip, wget }: mkDerivation rec { pname = "megasync"; @@ -36,15 +14,8 @@ mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ - autoconf - automake - doxygen - lsb-release - pkgconfig - qttools - swig - ]; + nativeBuildInputs = + [ autoconf automake doxygen lsb-release pkgconfig qttools swig ]; buildInputs = [ c-ares cryptopp @@ -85,21 +56,21 @@ mkDerivation rec { ''; configureFlags = [ - "--disable-examples" - "--disable-java" - "--disable-php" - "--enable-chat" - "--with-cares" - "--with-cryptopp" - "--with-curl" - "--with-ffmpeg" - "--without-freeimage" # unreferenced even when found - "--without-readline" - "--without-termcap" - "--with-sodium" - "--with-sqlite" - "--with-zlib" - ]; + "--disable-examples" + "--disable-java" + "--disable-php" + "--enable-chat" + "--with-cares" + "--with-cryptopp" + "--with-curl" + "--with-ffmpeg" + "--without-freeimage" # unreferenced even when found + "--without-readline" + "--without-termcap" + "--with-sodium" + "--with-sqlite" + "--with-zlib" + ]; postConfigure = '' cd ../.. @@ -114,10 +85,11 @@ mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Easy automated syncing between your computers and your MEGA Cloud Drive"; - homepage = https://mega.nz/; - license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" ]; + description = + "Easy automated syncing between your computers and your MEGA Cloud Drive"; + homepage = "https://mega.nz/"; + license = licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ maintainers.michojel ]; }; } From 080a6b0dab56b625dbd4b508624414a6bb362d93 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Wed, 26 Feb 2020 13:57:29 +0100 Subject: [PATCH 2/3] megasync: 4.2.3.0 -> 4.2.5.0 Also pull in an (as of yet unmerged) upstream patch to fix the build, it was failing on both .3 and .5 --- pkgs/applications/misc/megasync/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index 5de4cb002dcd..27e1b9d1f462 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -1,16 +1,17 @@ { stdenv, autoconf, automake, c-ares, cryptopp, curl, doxygen, fetchFromGitHub -, ffmpeg, libmediainfo, libraw, libsodium, libtool, libuv, libzen, lsb-release -, mkDerivation, pkgconfig, qtbase, qttools, sqlite, swig, unzip, wget }: +, fetchpatch, ffmpeg, libmediainfo, libraw, libsodium, libtool, libuv, libzen +, lsb-release, mkDerivation, pkgconfig, qtbase, qttools, sqlite, swig, unzip +, wget }: mkDerivation rec { pname = "megasync"; - version = "4.2.3.0"; + version = "4.2.5.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - sha256 = "0l4yfrxjb62vc9dnlzy8rjqi68ga1bys5x5rfzs40daw13yf1adv"; + sha256 = "1zw7x8gpvzhnzyirs5ishjl5idzyyin4wdxa67d6gzfgvqi33n7w"; fetchSubmodules = true; }; @@ -39,6 +40,13 @@ mkDerivation rec { ./noinstall-distro-version.patch # megasync target is not part of the install rule thanks to a commented block ./install-megasync.patch + + # Fix build errror also described upstream: + # https://github.com/meganz/MEGAsync/pull/313 + (fetchpatch { + url = "https://github.com/meganz/MEGAsync/pull/313.patch"; + sha256 = "1ld00cnh9afxibvkzkqi8gz59xlzidw2dy4yqngwwdqy76sfsn3w"; + }) ]; postPatch = '' From 8565dcf7bc7f6525063c24adb21ccbd663448a61 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Tue, 10 Mar 2020 16:34:48 +0100 Subject: [PATCH 3/3] megasync: 4.2.5.0 -> 4.3.0.8 --- pkgs/applications/misc/megasync/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index 27e1b9d1f462..3a26def26c91 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "megasync"; - version = "4.2.5.0"; + version = "4.3.0.8"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - sha256 = "1zw7x8gpvzhnzyirs5ishjl5idzyyin4wdxa67d6gzfgvqi33n7w"; + sha256 = "1rhxkc6j3039rcsi8cxy3n00g6w7acir82ymnksbpsnp4yxqv5r3"; fetchSubmodules = true; }; @@ -40,13 +40,6 @@ mkDerivation rec { ./noinstall-distro-version.patch # megasync target is not part of the install rule thanks to a commented block ./install-megasync.patch - - # Fix build errror also described upstream: - # https://github.com/meganz/MEGAsync/pull/313 - (fetchpatch { - url = "https://github.com/meganz/MEGAsync/pull/313.patch"; - sha256 = "1ld00cnh9afxibvkzkqi8gz59xlzidw2dy4yqngwwdqy76sfsn3w"; - }) ]; postPatch = ''