Nikolay Amiantov
7791a5362d
libtirpc: adopt
2015-02-18 19:00:54 +03:00
Domen Kožar
b7c3afa674
Merge pull request #5926 from benmos/postgis
...
Postgis 2.1.4 support
2015-02-18 12:08:59 +01:00
William A. Kennington III
ad0277fbdc
Merge pull request #6386 from codyopel/xvidcore
...
xvidcore: refactor & 1.3.2 -> 1.3.3
2015-02-17 22:29:40 -08:00
Arseniy Seroka
0e63ac0acf
Merge pull request #6402 from codyopel/xavs
...
xavs: add package
2015-02-17 23:42:01 +03:00
Shea Levy
2f061ff16b
Merge remote-tracking branch 'origin/staging'
...
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
codyopel
be0b4050aa
xavs: add package
2015-02-17 13:29:48 -05:00
lethalman
6be3ffb0d4
Merge pull request #6394 from codyopel/libwebp
...
libwebp: refactor & 0.4.1 -> 0.4.2
2015-02-17 15:28:35 +01:00
codyopel
1435e69758
wavpack: add package
2015-02-17 07:29:04 -05:00
codyopel
67f82fe49c
libwebp: refactor & 0.4.1 -> 0.4.2
2015-02-17 06:05:40 -05:00
Nathaniel Baxter
b19da5ba23
gecode: update from 4.3.0 to 4.3.3
2015-02-17 18:50:48 +11:00
codyopel
1b26e25845
xvidcore: refactor & 1.3.2 -> 1.3.3
2015-02-17 02:01:10 -05:00
codyopel
534332eaf7
vid-stab: add package
2015-02-17 00:54:23 -05:00
Aristid Breitkreuz
6aa43976a7
update http-types
2015-02-16 21:06:29 +01:00
AndersonTorres
f19ed980a2
Sawfish (git): New Package
...
Sawfish is a versatile, Lisp-based window manager
In that commit I include all Sawfish stack:
- librep, a lisp system;
- rep-gtk, bindings for gtk
- sawfish, the window manager
2015-02-15 19:42:53 +03:00
William A. Kennington III
b1fef78b8f
Merge pull request #6347 from codyopel/lamebr
...
lame: move to libraries & fix license
2015-02-14 16:08:34 -08:00
codyopel
b03ded550f
lame: move to libraries & fix license
2015-02-14 19:06:38 -05:00
William A. Kennington III
c6642675b9
Merge pull request #6336 from codyopel/gsm
...
gsm: seperate phases & fix shared library
2015-02-14 13:55:52 -08:00
codyopel
fc27383909
gsm: seperate phases & fix shared library
2015-02-13 21:04:03 -05:00
Peter Simons
f2a376f52a
Enable static libraries in "gmp" to allow static linking of Haskell programs.
...
Haskell programs depend on gmp to implement the unbounded Integer type. Without
static variants of gmp we cannot build statically linked Haskell programs, what
some users have found desirable in the past. So far, we've used an override to
derive our own copy of gmp in the Haskell ecosystem, but this patch ends the
dichotomy between Haskell and the rest of Nixpkgs by enabling static gmp
libraries in the default build default.
2015-02-13 22:18:27 +01:00
Peter Simons
600135bba5
Merge remote-tracking branch 'master' into staging.
2015-02-13 22:17:12 +01: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
Shea Levy
127efcd6f6
Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging
...
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv
Conflicts:
pkgs/applications/audio/ncmpcpp/default.nix
2015-02-11 19:37:22 -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
Ben Moseley
926e5aa70a
Remove old PostGis versions.
2015-02-09 15:57:19 +00: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