Commit Graph

19670 Commits

Author SHA1 Message Date
Vladimír Čunát
947abb08ac Merge branch 'staging' 2016-08-10 22:09:38 +02:00
Matthias C. M. Troffaes
ad27f0252e wolfssl: 3.9.6 -> 3.9.8 2016-08-10 11:02:55 +01:00
Robin Gloster
b08247f1e4 ptlib: 2.10.10 -> 2.10.11, add check for SSLv3 2016-08-10 07:12:08 +02:00
Franz Pletz
347c1ed8a0 libshout: 2.3.1 -> 2.4.1 2016-08-10 07:12:08 +02:00
Daiderd Jordan
c31f05e063 Merge pull request #17577 from LnL7/darwin-ffmpeg
ffmpeg: add extra darwin framework for 3.1
2016-08-09 08:13:11 +02:00
Thomas Tuegel
ca5b3368ca qttools: fix CMake paths
Fixes #17585.
2016-08-08 08:52:45 -05:00
Eelco Dolstra
2d71df18d3 Merge pull request #17588 from rnhmjoj/nss
nss: 3.23 -> 3.24
2016-08-08 12:11:26 +02:00
Daiderd Jordan
0456264754 Merge pull request #17517 from knedlsepp/add-json
nlohmann_json: init at 2.0.2
2016-08-08 00:29:09 +02:00
rnhmjoj
f2842da8b2
nss: 3.23 -> 3.24 2016-08-07 23:38:03 +02:00
Vladimír Čunát
24805b00c0 unixODBCDrivers.mariadb: fix evaluation
... after the parent merge, but the package was broken anyway.
2016-08-07 22:33:19 +02:00
Vladimír Čunát
950feb70b2 treewide: fixup various mysql ocurrences after re-split 2016-08-07 20:46:37 +02:00
Daiderd Jordan
e2fdd74a41
libsamplerate: fix missing darwin frameworks 2016-08-07 18:20:17 +02:00
Daiderd Jordan
b660ed3258
libmikmod: fix missing darwin framework 2016-08-07 17:52:06 +02:00
Daiderd Jordan
00b05d47d3
ffmpeg: add extra darwin framework for 3.1 2016-08-07 12:27:05 +02:00
Vladimír Čunát
50f909cf93 mesa: have vdpau drivers in lib/vdpau again
This was done by @abbradar 364f297bb2 but I lost that change by accident
when doing large closure-size merges 39ebb01d.
Fortunately it seems to have caused no problems, likely because
${mesa_drivers}/lib gets into $LD_LIBRARY_PATH.
2016-08-07 12:14:16 +02:00
Vladimír Čunát
03e32315a5 Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1286624
2016-08-07 11:35:28 +02:00
Vladimír Čunát
73e1242172 mesa: vdpau symlinks, broken after 1a52fdc
Fixes #17559.
Using *relative* symlinks doesn't break when moving the files.
2016-08-07 11:33:20 +02:00
Vladimír Čunát
a1b0967fa0 gtk3: maintenance 3.20.6 -> 3.20.8 2016-08-06 18:47:51 +02:00
Tuomas Tynkkynen
89c867196c SDL2_{gfx,image,net}: Broken on Darwin
Last successful Darwin build was 11 months ago, presumably nobody cares.

http://hydra.nixos.org/build/38317749
http://hydra.nixos.org/build/38318268
http://hydra.nixos.org/build/38322306
2016-08-06 18:27:20 +03:00
Tuomas Tynkkynen
ea14f5c86d http-parser: Broken on Darwin
http://hydra.nixos.org/build/38320273
2016-08-06 17:06:45 +03:00
Tuomas Tynkkynen
0498573573 drumstick: Broken on i686
http://hydra.nixos.org/build/38323068
2016-08-06 17:06:45 +03:00
Tuomas Tynkkynen
3c513ebc13 assimp: Broken on Darwin
http://hydra.nixos.org/build/38315116
2016-08-06 17:06:45 +03:00
Joachim F
af8b7d3a28 Merge pull request #17526 from RamKromberg/fix/wavpack
wavpack: 4.75.0 -> 4.80.0
2016-08-06 00:59:08 +02:00
Ram Kromberg
76c2988e33 wavpack: 4.75.0 -> 4.80.0 2016-08-05 13:54:56 +03:00
Josef Kemetmueller
54748c1e3f nlohmann_json: init at 2.0.2
A header only C++ library for modern JSON.
2016-08-04 23:34:23 +02:00
koral
b3beab9f03 webkitgtk: 2.10.4 -> 2.10.9 2016-08-04 21:18:38 +02:00
Thomas Tuegel
5b008e30b4 kdeWrapper: avoid excessive file collisions 2016-08-04 10:40:36 -05:00
Tobias Geerinckx-Rice
37528197a3
libpsl: 0.13.0 -> 0.14.0 2016-08-03 20:02:25 +02:00
Joachim F
70bf931498 Merge pull request #17410 from knedlsepp/motif-on-darwin
motif: Add support for darwin
2016-08-03 18:31:43 +02:00
Michael Raskin
ef46388c48 neovim-qt: 0pre -> 0.2.1, use libmsgpack 1.4 2016-08-03 17:58:22 +02:00
Alexey Shmalko
61a5c24209 cmocka: cross-compilation support (#17462) 2016-08-03 08:16:01 +02:00
Tuomas Tynkkynen
16d48b8280 Re-enable bunch of packages on Darwin
Prior to 1bf5ded193 these contained
`hydraPlatforms = platforms.linux`, which was apparently misleading.
2016-08-03 00:55:42 +03:00
Tuomas Tynkkynen
dc26ac6e04 libmng: Re-enable on Darwin
Prior to 1bf5ded193 this contained
`hydraPlatforms = platforms.linux`, which was apparently misleading.
2016-08-02 23:10:31 +03:00
Franz Pletz
9cfcf90832 libressl: 2.3.6 -> 2.3.7, 2.4.1 -> 2.4.2
Version 2.2.x is removed because it is not maintained by upstream anymore.
2016-08-02 21:21:02 +02:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
102ffa6be7 treewide: Wrap some really long package descriptions 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
63de40099f treewide: Move some meta sections to end-of-file
That seems to be the overwhelming convention.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
2258b21e4b treewide: Add lots of platforms to packages with no meta
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
59ce911810 treewide: Some EOF-whitespace fixes 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
1bf5ded193 treewide: Lots of meta.hydraPlatforms -> meta.platforms
In all of these files, there is no meta.platforms but only
meta.hydraPlatforms, which doesn't seem to have any purpose except being
inconsistent.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
b96fe03484 treewide: Fix meta.platforms related typos 2016-08-02 21:17:44 +03:00
Gabriel Ebner
dc01684799 Merge branch 'master' into staging 2016-08-02 18:40:34 +02:00
Frederik Rietdijk
0af0a20e1d Merge pull request #17140 from michelk/gdal/update
gdal: 2.0.2 -> 2.1.1
2016-08-02 10:57:25 +02:00
Thomas Tuegel
3445ab79a2 qt57.poppler: fix build
Packages that depend on Qt >= 5.7 must build using the C++11 standard.
2016-08-01 18:06:10 -05:00
Kranium Gikos Mendoza
7f3ca5d75b leatherman: disable curl test to fix build 2016-08-01 19:20:45 +08:00
Josef Kemetmueller
ee16dba630 motif: Add darwin support 2016-07-31 20:21:24 +02:00
Thomas Tuegel
ac98cc4d94 Merge pull request #17402 from ttuegel/plasma-closure-size
Plasma closure size
2016-07-31 10:29:07 -05:00
Vladimír Čunát
df2102b6a2 Merge #17112: fftw: 3.3.4 -> 3.3.5 2016-07-31 17:28:50 +02:00
Vladimír Čunát
c20f0f4462 Merge branch 'master' into staging 2016-07-31 17:28:25 +02:00
obadz
0d259f841b aws-sdk-cpp: add compile flag -fpermissive due to libcurl upgrade
curl upgrade to 7.50.0 (#17152) changes the libcurl headers slightly and
therefore requires the followin flag until this package gets updated
2016-07-31 15:03:50 +01:00