Commit graph

10 commits

Author SHA1 Message Date
Frederik Rietdijk
98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
Michal Minář
401c5d6069 megasync: 4.1.1.0 -> 4.2.3.0
Signed-off-by: Michal Minář <mic.liamg@gmail.com>
2019-08-25 17:09:15 +02:00
Vladimír Čunát
985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
Alkeryn
12e5cf479f megasync: use qt5's mkDerivation
See #65399
2019-08-24 16:35:04 -04:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Michal Minář
a2585fff23 reworked patches
lincense free -> unfree
enabled parallel build

Signed-off-by: Michal Minář <mic.liamg@gmail.com>
2019-06-25 04:23:47 +02:00
Michal Minář
6877159dc0 addressed comments
- ditched configurePhase and installPhase
- ffmpeg no longer optional

Signed-off-by: Michal Minář <mic.liamg@gmail.com>
2019-06-24 16:20:17 +02:00
Michal Minář
5864dfb513 megasync: init at 4.1.1.0
Signed-off-by: Michal Minář <mic.liamg@gmail.com>
2019-06-23 16:27:39 +02:00
markuskowa
2d9c747dc0 Revert "megasync: init at 3.7.1.0 (#53126)"
This reverts commit 7a1d22c600.
2019-02-09 02:17:25 +01:00
ElXreno
7a1d22c600 megasync: init at 3.7.1.0 (#53126)
* megasync: init at 3.7.1.0

* Removed inkscape from dependencies
2019-02-08 17:46:43 -05:00