codyopel
b03ded550f
lame: move to libraries & fix license
2015-02-14 19:06:38 -05:00
Peter Simons
54ce1a1810
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/development/compilers/ghc/head.nix
pkgs/top-level/haskell-ng.nix
2015-02-13 22:13:25 +01:00
Peter Simons
c6ed2aa203
Merge pull request #5968 from jkarni/jkarni/servant-server-0.2.3
...
I'll merge blindly, assuming that those changes have been tested by the submitter. If these updates cause any trouble, please don't hesitate to revoke if necessary.
2015-02-13 15:39:32 +01:00
Peter Simons
afaa01c957
Merge pull request #6009 from nkaretnikov/yesod-1.4.1.4
...
I'll merge blindly, assuming that those changes have been tested by the submitter. If these updates cause any trouble, please don't hesitate to revoke if necessary.
2015-02-13 15:38:41 +01:00
Pascal Wittmann
f393521630
libasr: fixed description
2015-02-13 14:29:11 +01:00
Pascal Wittmann
d7b01c8526
Merge pull request #6325 from k0ral/opensmtpd
...
opensmtpd: 5.4.2p1 -> 5.4.4p1
2015-02-13 13:28:04 +00:00
koral
3bc7dfdf22
opensmtpd: 5.4.2p1 -> 5.4.4p1
2015-02-13 12:38:21 +01:00
Domen Kožar
b2d17156bb
Merge pull request #6324 from codyopel/x265br
...
X265br
2015-02-13 01:22:16 +01:00
codyopel
3f22fdf7b0
x265: refactor & add optionals
2015-02-12 17:55:23 -05:00
codyopel
b60f5a004a
x265-hg: bump commit
2015-02-12 17:53:48 -05:00
codyopel
90ea935252
x265: 1.4 -> 1.5
2015-02-12 17:53:07 -05:00
codyopel
3269e202b1
libvpx-git: bump commit & disable high bitdepth builds on i686
2015-02-12 16:08:33 -05:00
Eric Seidel
a86fd94ecc
only link libsodium against libssp when building with gcc
2015-02-11 14:37:30 -08:00
Domen Kožar
2024e08564
partially fix pythonPackages.protobuf
2015-02-11 10:21:51 +01:00
codyopel
0f18322026
libvpx: refactor & add git ( close #6213 )
2015-02-10 19:52:58 +01:00
Luca Bruno
fd6e830aa3
gsm: compile with -fPIC to fix build in mediastreamer for ZHF
2015-02-10 18:52:02 +01:00
codyopel
80dd1aa437
faac: revert licensing change
2015-02-10 09:32:51 -05:00
William A. Kennington III
376dd19a79
Merge pull request #6270 from codyopel/fdkaac
...
fdk-aac: disable example encoder by default
2015-02-09 17:09:34 -08:00
William A. Kennington III
973b736c17
ldb: 1.1.19 -> 1.1.20
2015-02-09 17:05:57 -08:00
codyopel
9e60224efb
fdk-aac: disable example encoder by default
2015-02-09 15:18:20 -05:00
William A. Kennington III
88d508ae40
Merge pull request #6262 from codyopel/gsm
...
gsm: fix include directory
2015-02-09 11:14:53 -08:00
Peter Simons
7b99c149a4
Merge branch 'master' into staging.
2015-02-09 16:51:10 +01:00
codyopel
700f04b8da
gsm: fix include directory
2015-02-09 10:30:10 -05:00
codyopel
ac726eb2dd
libass: refactor & 0.11.1 -> 0.12.1
2015-02-09 10:27:10 -05:00
Daniel Peebles
f864b95dca
Merge pull request #6232 from maun/sdl2
...
Modified SDL2 derivation to work on Mac OSX darwin
2015-02-09 02:01:09 -05:00
Dan Peebles
b0e1db1159
Fix boost 1.55 on clang (1.56 onwards already have the fix)
...
See https://trac.macports.org/ticket/42282 for more.
2015-02-08 22:19:04 -05:00
William A. Kennington III
c165f24208
Merge pull request #6253 from codyopel/gsm
...
gsm: refactor
2015-02-08 17:21:04 -08:00
codyopel
c951d7d449
gsm: refactor
2015-02-08 20:16:54 -05:00
William A. Kennington III
bbefc61f71
Merge pull request #6241 from codyopel/faad2
...
faad2: refactor and add drm optional
2015-02-08 14:34:52 -08:00
William A. Kennington III
76f9f2b8ac
Merge pull request #6246 from codyopel/fdkaac
...
fdk-aac: refactor and add example optional
2015-02-08 14:34:32 -08:00
codyopel
51e995f006
fdk-aac: refactor and add example optional
2015-02-08 17:12:58 -05:00
codyopel
18fbca33bb
faad2: refactor and add drm optional
2015-02-08 17:02:17 -05:00
William A. Kennington III
ac99fefae1
Formatting fixes
2015-02-08 13:42:12 -08:00
William A. Kennington III
2a0ad62c56
Merge pull request #6239 from codyopel/faac
...
faac: refactor and add drm optional
2015-02-08 13:39:38 -08:00
William A. Kennington III
2828ad37e0
Merge pull request #6233 from codyopel/celt
...
celt: refactor to generic
2015-02-08 13:38:57 -08:00
William A. Kennington III
5a1089d024
Merge pull request #6245 from edwtjo/samba-collate-urls
...
fetchurl: collate samba project urls into a mirror
2015-02-08 13:38:01 -08:00
Edward Tjörnhammar
33a8a51657
fetchurl: collate samba project urls into a mirror
2015-02-08 22:29:27 +01:00
codyopel
58edd9431c
faac: refactor and add drm optional
2015-02-08 15:04:40 -05:00
codyopel
cd21ff1311
celt: refactor to generic
2015-02-08 12:30:37 -05:00
Manuel Adameit
c7a74ca5c6
Modified SDL2 derivation to work on Mac OSX darwin
...
default to no alsa on darwin
default to no x11 support on darwin
changed asserts to check for darwin
2015-02-08 18:08:14 +01:00
Peter Simons
8515b5ca7a
Merge pull request #6220 from joachifm/haskell-updates
...
Fix several haskellPackages build failures
2015-02-08 12:43:45 +01:00
Itai Zukerman
25e9475b19
Added Haskell package vector-fftw.
2015-02-07 22:29:40 -08:00
Joachim Fasting
9cc3a7771c
haskell-fb: bump version
...
Fixes build
2015-02-07 19:09:23 +00:00
Joachim Fasting
4b2433f156
haskell-hsc3-server: mark as broken
...
Latest version fails to build.
2015-02-07 19:01:09 +00:00
Joachim Fasting
90e1ba68be
haskell-iteratee: mark as broken
...
Latest version fails to build.
2015-02-07 18:57:10 +00:00
Joachim Fasting
677dee38db
haskell-simple-conduit: jailbreak required
2015-02-07 18:55:49 +00:00
Joachim Fasting
c336769408
haskell-shell-conduit: mark as broken
...
Latest version fails to build.
2015-02-07 18:52:39 +00:00
Thomas Tuegel
042e4ad633
qt5split: add split submodule build of Qt 5.3
2015-02-07 12:52:20 -06:00
Joachim Fasting
32fd92e7dc
haskell-hcltest: mark as broken
...
Latest version on hackage fails to build.
2015-02-07 18:49:02 +00:00
Joachim Fasting
09c6d80ac0
haskell-webdriver: bump version
...
Fixes build error, jailbreak no longer necessary
2015-02-07 18:46:38 +00:00
