Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 91cdcf313578
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8c1977c54a96
Choose a head ref
  • 5 commits
  • 2 files changed
  • 3 contributors

Commits on May 15, 2020

  1. megasync: format with nixfmt 

    (cherry picked from commit 5e55ebb)
    @Synthetica9 @lunik1
    Synthetica9 authored and lunik1 committed May 15, 2020
    Copy the full SHA
    fd6368a View commit details

  2. 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

(cherry picked from commit 080a6b0)
    @Synthetica9 @lunik1
    Synthetica9 authored and lunik1 committed May 15, 2020
    Copy the full SHA
    79160c7 View commit details

  3. megasync: 4.2.5.0 -> 4.3.0.8 

    (cherry picked from commit 8565dcf)
    @Synthetica9 @lunik1
    Synthetica9 authored and lunik1 committed May 15, 2020
    Copy the full SHA
    2a83fa4 View commit details

Commits on May 16, 2020

  1. pytrainer: fix missing pkg_resources 

    (cherry picked from commit 04d6123)
    @jtojnar @rycee
    jtojnar authored and rycee committed May 16, 2020
    Copy the full SHA
    729a301 View commit details

  2. Merge pull request #87901 from lunik1/backport-megasync-4.3.0.8 

    [20.03] megasync 4.2.3.0 -> 4.3.0.9 (backport)
    @marsam
    marsam authored May 16, 2020
    Copy the full SHA
    8c1977c View commit details
Showing with 29 additions and 55 deletions.
  1. +28 −55 pkgs/applications/misc/megasync/default.nix
  2. +1 −0 pkgs/applications/misc/pytrainer/default.nix
83 changes: 28 additions & 55 deletions pkgs/applications/misc/megasync/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,22 @@
{ 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
, 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.3.0.8";

src = fetchFromGitHub {
owner = "meganz";
repo = "MEGAsync";
rev = "v${version}_Linux";
sha256 = "0l4yfrxjb62vc9dnlzy8rjqi68ga1bys5x5rfzs40daw13yf1adv";
sha256 = "1rhxkc6j3039rcsi8cxy3n00g6w7acir82ymnksbpsnp4yxqv5r3";
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 +57,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 +86,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 ];
};
}
1 change: 1 addition & 0 deletions pkgs/applications/misc/pytrainer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -57,6 +57,7 @@ python3.pkgs.buildPythonApplication rec {
psycopg2
requests
certifi
setuptools
];

nativeBuildInputs = [