Commit Graph

16261 Commits

Author SHA1 Message Date
Lluís Batlle i Rossell a22c19f56a Fixing judy for gcc 4.8
gtkwave crashes often, without this fix.
http://sourceforge.net/p/judy/mailman/message/31995144/
2015-03-09 15:37:50 +01:00
Thomas Tuegel 7b2adc0039 Merge branch 'kde5' 2015-03-09 06:43:13 -05:00
Peter Simons ecad102326 pkgs/development/libraries/ffmpeg/generic.nix: don't insert faac into buildInputs unconditionally
This is a hot-fix to mitigate https://github.com/NixOS/nixpkgs/issues/6727.
2015-03-09 12:30:16 +01:00
Thomas Tuegel a1700f8400 kf57: include Qt GraphicalEffects submodule 2015-03-08 17:37:29 -05:00
William A. Kennington III b452bd40e1 Merge pull request #6602 from codyopel/ffmpegbr
ffmpeg: refactor to generic
2015-03-08 15:23:55 -07:00
Michael Raskin 81eafd7761 update directfb 2015-03-09 01:03:01 +03:00
Michael Raskin 1fdc855b2f Update botan unstable 2015-03-09 01:03:01 +03:00
lethalman 0a83c2a2a9 Merge pull request #6697 from ardumont/add-tuxguitar
[new] tuxguitar derivation
2015-03-08 11:54:57 +01:00
Antoine R. Dumont 4c985c26af Update swt installation
Permit the installation for x86_64
2015-03-08 10:22:55 +01:00
Carles Pagès 2bc4f5c149 SDL2_ttf: add version 2.0.12 2015-03-07 14:35:19 +01:00
Shea Levy 6b53021205 Merge branch 'master' into staging 2015-03-06 19:02:36 +00:00
Vladimír Čunát 33fbec14b6 opencascade-6.5: maintenance update
They claim it's ABI-compatible.
2015-03-06 14:44:21 +01:00
Vladimír Čunát 0ea7d9b6f9 opencascade*: fix build after mesa update 2015-03-06 14:44:01 +01:00
Vladimír Čunát cdd00f47fa libav*.tools: remove overlapping paths, fixes #6682 2015-03-06 12:55:08 +01:00
Eelco Dolstra ad896e1737 Typo 2015-03-06 12:09:10 +01:00
Vladimír Čunát 33153a2166 paraview, vtk: fix build after mesa update 2015-03-06 12:09:01 +01:00
Vladimír Čunát 0ce3dcd91a libxmi: fix build after libtool bump
The file copied by libxmi builder seems moved.
2015-03-06 10:28:29 +01:00
Tobias Geerinckx-Rice 47712a21bd Add libxcomp 3.5.0-2015-02-18
Thanks to Christoph-Simon Senjak <c s s at u x u l dot d e>
2015-03-06 03:48:39 +01:00
Peter Simons 58795b953b uid_wrapper: the unquoted meta.homepage url breaks evaluation 2015-03-05 17:41:36 +01:00
Peter Simons 455fc68fbb socket_wrapper: the unquoted meta.homepage url breaks evaluation 2015-03-05 17:40:55 +01:00
Peter Simons 0ac77f4690 nss_wrapper: the unquoted meta.homepage url breaks evaluation 2015-03-05 17:40:17 +01:00
Peter Simons 1d953779b0 Merge remote-tracking branch 'origin/master' into staging. 2015-03-05 12:24:57 +01:00
William A. Kennington III e15cd2375e kerberos: Add development string 2015-03-04 16:48:52 -08:00
William A. Kennington III c5dce2def0 uid_wrapper: Add derivation 2015-03-04 16:48:52 -08:00
William A. Kennington III 88c01c5647 socket_wrapper: Add derivation 2015-03-04 16:48:52 -08:00
William A. Kennington III 3e4fa69a90 nss_wrapper: Add derivation 2015-03-04 16:48:51 -08:00
William A. Kennington III 7b517a4b29 tevent: 0.9.23 -> 0.9.24 2015-03-04 16:48:51 -08:00
Vladimír Čunát 2485055a96 gtk2: maintenance update
Perhaps a bugfix important for us:
745052 Icon theme code assumes directories with mtime 0 don't exist
2015-03-04 22:02:45 +01:00
Eric Seidel 6c6d8772ed libsoup: patch to remove non-existent symbol 2015-03-03 20:16:33 -08:00
William A. Kennington III d6ed3570b0 openct: 0.6.19 -> 0.6.20 2015-03-03 14:27:49 -08:00
William A. Kennington III 731e833e99 tevent: 0.9.22 -> 0.9.23 2015-03-03 12:55:40 -08:00
Vladimír Čunát 54fc2db1b8 glibc: update 2.20 -> 2.21, including security fixes
Fixes #6578.
https://sourceware.org/ml/libc-alpha/2015-02/msg00119.html

- I had to disable one warning-error type.
- One of our patches needed modification - it seemed that just the context
  changed without affecting the purpose of the patch.
2015-03-03 11:31:01 +01:00
William A. Kennington III adbba6eded Merge pull request #6528 from codyopel/stdenv-fixes
remove stdenv.isBSD
2015-03-02 20:10:07 -08:00
Ambroz Bizjak d777470c3d KDevelop: Update to 4.7.1. 2015-03-03 01:44:36 +01:00
Peter Simons 5341196f01 Merge branch 'master' into staging. 2015-03-02 21:10:36 +01:00
Lluís Batlle i Rossell b5855077fc Merge staging until the libsigsegv 'fix'
The fix that disables libsigsegv.
2015-03-01 22:12:05 +01:00
Pascal Wittmann 75a988394b Merge pull request #6608 from bobvanderlinden/lirc-0.9.2a
lirc: upgraded to 0.9.2a
2015-03-01 18:58:21 +00:00
Robert Scott 7476de722b luabind: add patch to allow us to discover a provided luajit 2015-02-28 22:37:16 +00:00
Sander van der Burg 62080e3939 smack: bump to version 3.4.1 2015-02-28 21:54:15 +00:00
Bob van der Linden 186348f831 lirc: fix python reference in build tools 2015-02-28 20:30:04 +01:00
codyopel 6ed1d9f525 ffmpeg: refactor to generic
* migrate some branches from ffmpeg.config.<optional>, now allows version specific configuration
* Added optionals for most features
* Added qt-faststart executable
* Licensing corrections
* Added dependencies
    + celt
    + faad2
    + flite
    + frei0r-plugins
    + fribidi
    + game-music-emu
    + gsm
    + jack2
    + ladspa-sdk
    + libavc1394
    + libbluray
    + libbs2b
    + libcaca
    + libmodplug
    + libogg
    + libraw1394
    + libssh
    + libwebp
    + libxcb
    + lzma
    + openal
    + opencl
    + opengl
    + openh264
    + openjpeg
    + openssl
    + pulseaudio
    + rtmpdump
    + samba
    + soxr
    + v4l-utils
    + vid.stab
    + wavpack
    + libX11
    + libXv
    + wavpack
    + x265
    + xavs
    + xvidcore
    + zeromq
* Outlines support for: (unpackaged/broken dependencies)
    + aacplus
    + avisynth
    + crystalhd
    + blackmagic-design-desktop-video
    + flite
    + ilbc
    + libavc1394
    + libcdio-paranoia
    + libiec61883
    + libmfx
    + libnut
    + nvenc (nvidia)
    + opencl
    + opencore-amr
    + openh264
    + oss
    + libquvi
    + schroedinger
    + shine
    + twolame
    + utvideo
    + vo-aacenc
    + vo-amrwbenc
    + zvbi
2015-02-28 12:12:25 -05:00
Bob van der Linden 45216b82a1 lirc: upgraded to 0.9.2a 2015-02-28 17:49:58 +01:00
Domen Kožar 1fb78f8994 openssl: 1.0.1k -> 1.0.1l 2015-02-27 12:59:59 +01:00
Domen Kožar 83b9a19390 dbus-glib: 0.102 -> 0.104 (fixes nm-applet empty menu) 2015-02-27 12:59:59 +01:00
Luca Bruno a7879236bd mysql-workbench: fix build using libctemplate 2.2 2015-02-27 12:10:25 +01:00
Luca Bruno 836b3d835e botanUnstable: 1.11.13 doesn't exist, use 1.11.10 2015-02-27 11:08:31 +01:00
Vladimír Čunát a24ef4f338 harfbuzz: small update 2015-02-26 20:31:41 +01:00
Vladimír Čunát d3bfead0d4 dbus-glib: maintenance update 2015-02-26 20:26:26 +01:00
Vladimír Čunát be18346534 glib: maintenance update 2015-02-26 20:14:45 +01:00
Vladimír Čunát c01dd4ab57 gtk2: small maintenance update 2015-02-26 20:06:02 +01:00
Thomas Tuegel b692340441 openblas: fix build on i686 2015-02-26 06:44:03 -06:00
Peter Simons d6c295e469 Merge remote-tracking branch 'origin/master' into staging. 2015-02-25 20:18:28 +01:00
Vincent Laporte b6d8d57905 libharu: update from 2.2.1 to 2.3.0 2015-02-25 08:46:57 +01:00
codyopel e29b0da9c7 remove stdenv.isBSD 2015-02-24 22:15:51 -05:00
Mateusz Kowalczyk cc4a5073e2 Resurrect openjpeg 2.0.x and use it for mupdf
mupdf doesn't compile with 2.1 due to API changes

cc @codyopel who made the openjpeg update
2015-02-25 01:50:06 +00:00
vbgl 8300898f98 Merge pull request #6533 from michelk/gdal_1.11.2
gdal: update to 1.11.2
2015-02-24 22:45:50 +01:00
William A. Kennington III 51b7fe53fa libinput: 0.10 -> 0.11 2015-02-24 11:52:19 -08:00
William A. Kennington III dbaf941212 Merge pull request #6422 from codyopel/libinput
libinput: refactor & add optional dependencies
2015-02-24 11:47:45 -08:00
Eelco Dolstra 843f21fd6a nss: Update to 3.17.4 2015-02-24 18:50:04 +01:00
Eelco Dolstra 3facd6b66d sqlite: Update to 3.8.7.4 2015-02-24 18:42:16 +01:00
codyopel ac2ed3818c libinput: refactor & add optional dependencies 2015-02-24 02:39:31 -05:00
Michel Kuhlmann 3e87b82fe2 gdal: enabling geos
In order to use ogr2ogr for clipping, this options needs to be
enabled.
2015-02-24 08:35:34 +01:00
William A. Kennington III ee41f35c40 Merge pull request #6490 from codyopel/openjpegbr
openjpeg: refactor to generic, add 1.x & 2.0.0 -> 2.1.0
2015-02-23 22:02:56 -08:00
Nathaniel Baxter 0be8418275 libvirt: update from 1.2.9 to 1.2.12
libvirt-glib: update from 0.1.9 to 0.2.0
pythonPackages.libvirt: update from 1.2.9 to 1.2.12

Potentially fixes CVE-2014-7823 CVE-2015-0236
2015-02-23 20:09:54 +01:00
Jaka Hudoklin 284046cebc Merge pull request #6510 from offlinehacker/pkgs/libsass/add
Add libsass
2015-02-23 13:07:11 +01:00
Nikolay Amiantov 68ed035798 Merge pull request #6506 from nathanielbaxter/dev/libbluray
libbluray: fix aacs support
2015-02-23 14:17:41 +03:00
Michel Kuhlmann 0c22975cb2 gdal: update to 1.11.2 2015-02-23 11:29:14 +01:00
lethalman ff98a8c24c Merge pull request #6513 from valeriangalliat/nodejs-iojs-libuv-shared
Shared libuv in io.js and Node.js
2015-02-23 11:10:05 +01:00
Mateusz Kowalczyk 6a6cc70978 Merge pull request #6505 from nathanielbaxter/dev/ffmpeg
ffmpeg: update 2.5.3 to 2.5.4
2015-02-23 07:30:50 +00:00
Vladimír Čunát c8f2a31de3 libav-11: maintenance update, including security
CVE-2014-{8541,8542,8543,8547,8548,8549}
2015-02-22 21:32:31 +01:00
Eduard Bachmakov 0e9a0c9913 mesa: big update, and related improvements (close #6367)
* Remove upstreamed patch
* EGL driver dirs are no longer a thing, see mesa commit
  407450eb84f5a1b466a2eff19b85cdee7ac15dfb
  Patching runtime search dir in sources instead (by vcunat).
* static-gallium patch dropped as it causes visibility issues with
  nouveau
* rtti patch dropped as it the relevant configuration has been removed
  upstream; properly fixed by an LLVM flag now
* Checks disabled. This is known and solved upstream. Checks will be
  re-enabled in a future commit when updating to a version containing
  the fixes
* Use llvm-3.5 now (by vcunat).
2015-02-22 20:08:08 +01:00
Vladimír Čunát bb587dd5cc dbus: security bump to fix CVE-2015-0245 2015-02-22 20:01:03 +01:00
Vladimír Čunát fe76b8e608 libdrm: update 2015-02-22 20:01:03 +01:00
Vladimír Čunát 3d9e9f6571 glibc: fix -lgcc_s linking
https://github.com/NixOS/nixpkgs/commit/65221567c12eb20d12#commitcomment-9515597
2015-02-22 20:01:03 +01:00
Vladimír Čunát bb8d3ad2de Merge 'master' into staging 2015-02-22 19:18:07 +01:00
Robert Scott 4147050550 add a (slightly naive) packaging of osrm-backend and its missing dependencies 2015-02-22 14:34:24 +00:00
Valérian Galliat ef86e3c1b5 libuv: version 1.4.0 2015-02-22 12:41:03 +01:00
Jaka Hudoklin 8de806ebd4 Add libsass 2015-02-22 12:03:06 +01:00
Nathaniel Baxter e149afe3a1 quazip: update from 0.7 to 0.7.1 2015-02-22 15:16:39 +11:00
Nathaniel Baxter 89f4507c5c libbluray: fix aacs support 2015-02-22 14:39:37 +11:00
Nathaniel Baxter 798a42a3ee ffmpeg: update 2.5.3 to 2.5.4 2015-02-22 11:58:48 +11:00
Arseniy Seroka 8887ad850f Merge pull request #6487 from ftrvxmtrx/openal-soft-1.16.0
openal-soft 1.15.1 -> 1.16.0
2015-02-22 00:25:55 +03:00
Thomas Tuegel 8cf78bf5f4 update various packages to use Qt 5.4 2015-02-21 11:39:20 -06:00
Thomas Tuegel 0cf073627c remove split qt-5.3 2015-02-21 11:39:19 -06:00
Thomas Tuegel 2e7bf4ff60 remove kde-frameworks-5.5 and kde-frameworks-5.6 2015-02-21 11:39:19 -06:00
Thomas Tuegel 5dcab4fcf3 add kde-frameworks-5.7 2015-02-21 11:39:19 -06:00
Thomas Tuegel 2e38240c95 add qt-5.4 2015-02-21 11:39:18 -06:00
codyopel f10a8f8501 openjpeg: refactor to generic, add 1.x & 2.0.0 -> 2.1.0 2015-02-20 22:20:19 -05:00
Siarhei Zirukin 61b8aa26f2 openal-soft 1.15.1 -> 1.16.0 2015-02-21 00:44:18 +01:00
William A. Kennington III 1dd647eba6 protobuf: Remove v as it is unneeded now 2015-02-20 10:42:14 -08:00
William A. Kennington III f58c96149d protobuf: Fix python build 2015-02-20 10:36:16 -08:00
Aycan iRiCAN 494fb2deb2 Updated haskellPackages.{rest-wai, rest-snap} 2015-02-20 16:13:49 +02:00
Luca Bruno 332c32b772 Revert "v8: 3.26.31.15 -> 3.31.1"
This reverts commit 098ed10f39.
2015-02-20 14:07:59 +01:00
Luca Bruno fb4fc507ef Revert "v8: Properly update to 4.1.0.15"
This reverts commit 1570cb501c.
2015-02-20 14:07:59 +01:00
Sebastián Bernardo Galkin 8a7097972e Postgis requires json_c to provide GeoJson support
This change adds the needed build dependency and configuration to postgis
2015-02-19 18:05:49 -08:00
Franz Pletz 22bfa41033 Update libressl to 2.1.3 2015-02-19 19:33:41 +01:00
William A. Kennington III e574da83de wayland: Always build documentation 2015-02-19 09:57:16 -08:00
codyopel a53da93b2b wayland: 1.6.0 -> 1.7.0 & add optionals
All non-essential dependencies are now optional, with exception
to wayland-scanner which if not enabled causes wayland to fail to build
2015-02-19 09:47:40 -08:00
Dan Peebles e25150bb10 No need for this hack anymore 2015-02-18 22:18:57 -05:00
William A. Kennington III 524e815af1 krb5: 1.13 -> 1.13.1 2015-02-18 18:20:53 -08:00
William A. Kennington III f94d0c3aa7 ctl: Update to 1.5.2 2015-02-18 18:03:34 -08:00
William A. Kennington III e9c1a56f97 ilmbase: Update to openexr version 2015-02-18 18:03:34 -08:00
William A. Kennington III 51cc9612b7 openexr: 1.7.1 -> 2.2.0 2015-02-18 18:03:34 -08:00
Vladimír Čunát a9e4fc1079 poppler-qt4: fix rendering, fixes #6366
The subpixel patches seem to cause trouble in recent versions.
2015-02-18 21:38:23 +01:00
Peter Simons 01d06e8ed8 Merge pull request #6428 from joachifm/more-haskell-updates
Fix some haskellPackages build failures
2015-02-18 20:37:44 +01:00
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
Sergey Mironov ef3dbaa69a utf8proc: add the library 2015-02-18 11:51:11 +03:00
Joachim Fasting baba36ce27 haskell-rest-happstack
Fixes build
2015-02-18 06:53:13 +00:00
Joachim Fasting c2f216b8e1 haskell-rest-types: version bump 2015-02-18 06:53:13 +00:00
Joachim Fasting 233cc55dc4 haskell-rest-core: version bump 2015-02-18 06:53:08 +00:00
Joachim Fasting b3bacd4d0c haskell-pool-conduit: mark as broken
Fails to build, deprecated.
2015-02-18 06:41:09 +00:00
Joachim Fasting 45b9432f82 haskell-happstack-lite: version bump
Fixes build
2015-02-18 06:39:02 +00:00
Joachim Fasting fbe66014ab haskell-happstack-hamlet: mark as broken
No upstream version supports happstack-server >= 7.4
2015-02-18 06:37:52 +00: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
Peter Simons 953466fcba libsigsegv: disable test suite to avoid crashes with certain kernel versions
Further details are at:

 - https://lists.gnu.org/archive/html/bug-libsigsegv/2015-01/msg00001.html
 - http://lists.opensuse.org/opensuse-factory/2015-01/msg00408.html

Resolves https://github.com/NixOS/nixpkgs/issues/6028, kind of.
2015-02-17 23:36:14 +01: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
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
Eric Seidel e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -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
Joachim Fasting a2c87d374f haskell-stm-conduit: version bump
Fixes build failure
2015-02-07 18:25:57 +00:00
Joachim Fasting 71f8367b28 haskell-rest-client: version bump
Fixes build failure
2015-02-07 18:25:57 +00:00
Joachim Fasting a964403dae haskell-higher-leveldb: version bump
Fixes build failure
2015-02-07 18:25:57 +00:00
Joachim Fasting 51606074cd haskell-list-t: version bump 2015-02-07 18:25:57 +00:00
Joachim Fasting ca7c4c2b5c haskell-distributed-process-monad-control: version bump
Fixes build failure
2015-02-07 18:25:56 +00:00
Joachim Fasting 082469bc81 haskell-jwt: declare missing deps 2015-02-07 18:25:56 +00:00
Joachim Fasting f63f6d5a3a haskell-happstack-server: bump version to 7.4.0
Fixes build error. Also doCheck and jailbreak no longer necessary.
2015-02-07 18:25:56 +00:00
Joachim Fasting 3d7cda6b23 haskell-EitherT: mark as broken
Fails to build, deprecated.
2015-02-07 18:25:56 +00:00
Joachim Fasting 7c715dd746 haskell-yesod: bump to version 1.4.1.4
Fixes build failure
2015-02-07 18:25:55 +00:00
Joachim Fasting 8fcba36796 haskell-yesod-core: bump to version 1.4.7.2
Fixes build failure. Also, jailbreak appears to no longer be necessary.
2015-02-07 18:25:55 +00:00
Joachim Fasting 94b179362a haskell-persistent: bump to 2.1.1.4
Fix build error
2015-02-07 18:25:55 +00:00
Thomas Tuegel fa56e5ffa7 qt5: move monolithic build 2015-02-07 07:30:18 -06:00
William A. Kennington III 1570cb501c v8: Properly update to 4.1.0.15 2015-02-06 22:52:39 -08:00
William A. Kennington III 098ed10f39 v8: 3.26.31.15 -> 3.31.1 2015-02-06 22:25:45 -08:00
Vladimír Čunát da3105d538 exiv2: fix CVE-2014-9449 by upstream patch
It's just a crash fix, not a "real" vulnerability.
2015-02-07 06:48:21 +01:00
William A. Kennington III a1f6084fc8 libu2f-host: 0.0.2 -> 0.0.4 2015-02-06 12:53:10 -08:00
William A. Kennington III 170775a834 libinput: 0.7.0 -> 0.10.0 2015-02-06 12:53:09 -08:00
William A. Kennington III 9f0a6d6d7f protobufc: Add version 1.1.0 as the default 2015-02-06 12:53:09 -08:00
William A. Kennington III 673b18fdd7 protobuf: Support both 2.5 and 2.6 and make 2.6 the default 2015-02-06 12:53:09 -08:00
William A. Kennington III f9dcf13b6e gtest: Modularize out the source files into a derivation 2015-02-06 12:53:09 -08:00
Joachim Fasting f1951f932d haskell-resource-pool: bump to 0.2.3.2
Fixes build error.
2015-02-06 09:08:24 +00:00
Thor A. Hopland 28b8c50c2d Added Touchegg and 3 depdenencies. Touchegg is a daemon for X that adds gesture based navigation for touch based surfaces. 2015-02-06 06:53:32 +01:00
Peter Simons 37a39e9cb4 gmp: drop obsolete and unused version 5.0.5 2015-02-06 00:32:00 +01:00
Ambroz Bizjak 349a25fb2c libelf: Fix cross-compile by adding glibc as a native build input.
TBD: This can probably be unconditional but I put it into crossAttrs to avoid a rebuild of native stuff.
2015-02-05 21:26:02 +01:00
Ambroz Bizjak e191e227d2 glibc: Disable copying libgcc when cross compiling.
It seems this is only needed for native bootstrapping.
2015-02-05 21:25:40 +01:00
Russell O'Connor 3feac4fd86 Merge branch 'master' of github.com:NixOS/nixpkgs 2015-02-05 15:21:54 -05:00
Russell O'Connor af3c4a2744 Bitcoin 0.9.3 won't work with OpenSSL 1.0.1k.
This patch restores OpenSSL 1.0.1j and builds Bitcoin against it.
2015-02-05 11:40:57 -05:00
Emil Rangden 654d1f21b2 despotify source moved 2015-02-05 17:37:19 +01:00
Mike Sperber daa1941d27 Unbreak ADNS on Darwin.
Make the version number in postInstall match that of the package.
2015-02-05 15:02:23 +01:00
Vladimír Čunát 474aeb0b3d ffmpeg-2.2: update (still used by vlc) 2015-02-05 11:19:18 +01:00
Sou Bunnbu dcc543f8fe Merge pull request #6125 from ktosiek/dynamic-glfw2
Build and install the .so for glfw 2.x
2015-02-05 10:02:11 +08:00
Shea Levy e14d39b97b Merge branch 'osx-i3-urxvt' of git://github.com/cresh/nixpkgs 2015-02-04 22:14:52 +00:00
Vladimír Čunát 4495d06a7f Merge branch 'master' into staging
Conflicts (simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/top-level/all-packages.nix
2015-02-04 22:00:07 +01:00
Marcus Crestani 92ca614934 i3: Use xcb-util-cursor-HEAD on OS X. 2015-02-04 20:44:19 +01:00
Marcus Crestani 455d9600e1 libev: Enable on all platforms. 2015-02-04 20:44:00 +01:00
Rickard Nilsson 57d71cf8d2 More download mirrors for samba URLs 2015-02-04 17:38:39 +01:00
Rickard Nilsson 52cb8db899 libldb: Add mirror url 2015-02-04 17:05:16 +01:00
Peter Simons 955001a55b Merge pull request #6134 from joachifm/haskell-monad-logger
haskell-monad-logger: version bump
2015-02-04 12:07:14 +01:00
Domen Kožar eaeef0377f jasper: CVE-2014-8157, CVE-2014-8158, fixes #6114 2015-02-04 11:37:49 +01:00
John Wiegley ad60eaedf1 clucene-core: make darwin-related patch conditional
This relates to pull request #6137, and was made at request of the
submitter.
2015-02-04 01:40:17 -06:00
Eric Seidel 58a891afb2 fix clucene on darwin 2015-02-03 23:34:03 -08:00
Eric Seidel a600443bb3 fix obscure bug in apr on darwin 2015-02-03 23:11:44 -08:00
Joachim Fasting 40b4b1490d haskell-monad-logger: version bump
The previous version fails to build.
2015-02-04 04:03:10 +01:00
Eric Seidel cbd446d465 fix gmp on darwin 2015-02-03 15:18:28 -08:00
Eric Seidel 4a467ec02b move libcxx[abi] into llvm tree 2015-02-03 14:58:10 -08:00
Eric Seidel dbf3d31727 make llvm-3.5 the default and remove references to gccApple
make perl be less dumb

revert change to release.nix
2015-02-03 14:31:04 -08:00
Eric Seidel 6f7632a7bd update libcxx[abi] to 3.5 2015-02-03 14:02:59 -08:00
Tomasz Kontusz 9d8defa06a Build and install the .so for glfw 2.x 2015-02-03 21:33:26 +01:00
Peter Simons d034aa11ee Merge pull request #6121 from boothead/kafka
Kafka and c libraries for kafka and zookeeper
2015-02-03 20:17:22 +01:00
Eelco Dolstra 007feb911d libsodium: Update to 1.0.2 2015-02-03 16:59:28 +01:00
Eelco Dolstra 86db6789ef libsodium: Fix typo 2015-02-03 16:28:20 +01:00
Nikolay Amiantov 93928557b9 Merge pull request #6107 from abbradar/updates
Update my packages
2015-02-03 15:39:26 +03:00
Peter Simons a98c79d6a1 libmikmod: update to version 3.3.7 2015-02-03 12:46:39 +01:00
Nikolay Amiantov a620487213 xlslib: update package 2015-02-03 14:27:51 +03:00
Nikolay Amiantov d6363498e0 ipopt: update package 2015-02-03 14:27:51 +03:00
Nikolay Amiantov 62f2191b8b libxls: update homepage 2015-02-03 14:27:50 +03:00
Nikolay Amiantov 10d6af5f86 libaacs: update package 2015-02-03 14:27:50 +03:00
Nikolay Amiantov 7e48fc4c8f folly: update package 2015-02-03 14:27:50 +03:00
Nikolay Amiantov 7a2387a6b5 libbluray: update package 2015-02-03 14:27:50 +03:00
Nikolay Amiantov c6dece9986 libiberty: update package 2015-02-03 14:27:50 +03:00
Nikolay Amiantov b6dfcaa08e double-conversion: update package 2015-02-03 14:27:49 +03:00
Nikolay Amiantov 581549cc1a libfprint: update package 2015-02-03 14:27:49 +03:00
Ben Ford 02301a96db Add the zookeeper_mt c library 2015-02-03 08:48:32 +00:00
Ben Ford 12f9ea9773 Add the rdkafka c library 2015-02-03 08:46:25 +00:00
Mateusz Kowalczyk 61a493f735 Merge pull request #6103 from rdesfo/master
haskell: updated yi-language to 0.1.1.0
2015-02-03 03:42:51 +00:00