Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 52b180ad5408
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bf8f06748a01
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 6, 2020

  1. megasync: 4.3.1.0 -> 4.3.5.0 

    Resolves #102634

Signed-off-by: Michal Minář <mic.liamg@gmail.com>
    @michojel
    michojel authored and Jonathan Ringer committed Nov 6, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    40bd50c View commit details

  2. megasync: bumped qt to 5.15 

    Signed-off-by: Michal Minář <mic.liamg@gmail.com>
    @michojel
    michojel authored and Jonathan Ringer committed Nov 6, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bf8f067 View commit details
Showing with 31 additions and 7 deletions.
  1. +30 −6 pkgs/applications/misc/megasync/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
36 changes: 30 additions & 6 deletions pkgs/applications/misc/megasync/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,40 @@
{ stdenv, autoconf, automake, c-ares, cryptopp, curl, doxygen, fetchFromGitHub
, fetchpatch, ffmpeg_3, 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
, fetchpatch
, ffmpeg_3
, libmediainfo
, libraw
, libsodium
, libtool
, libuv
, libzen
, lsb-release
, mkDerivation
, pkgconfig
, qtbase
, qttools
, qtx11extras
, sqlite
, swig
, unzip
, wget
}:

mkDerivation rec {
pname = "megasync";
version = "4.3.1.0";
version = "4.3.5.0";

src = fetchFromGitHub {
owner = "meganz";
repo = "MEGAsync";
rev = "v${version}_Linux";
sha256 = "0b68wpif8a0wf1vfn1nr19dmz8f31dprb27jpldxrxhyfslc43yj";
sha256 = "0rr1jjy0n5bj1lh6xi3nbbcikvq69j3r9qnajp4mhywr5izpccvs";
fetchSubmodules = true;
};

@@ -29,6 +52,7 @@ mkDerivation rec {
libuv
libzen
qtbase
qtx11extras
sqlite
unzip
wget
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -2345,7 +2345,7 @@ in

medusa = callPackage ../tools/security/medusa { };

megasync = libsForQt514.callPackage ../applications/misc/megasync { };
megasync = libsForQt515.callPackage ../applications/misc/megasync { };

megacmd = callPackage ../applications/misc/megacmd { };