Commit Graph

14226 Commits

Author SHA1 Message Date
Vladimír Čunát
be70104a3a Merge master into x-updates
Conflicts (taken master):
	pkgs/development/compilers/llvm/3.4/llvm.nix
2014-02-04 22:00:09 +01:00
Vladimír Čunát
ec985c8ffa fontconfig: stop using xml:space; vital for nixos+2.11
Since fontconfig-2.11 the xml:space attribute makes it reject
/etc/fonts/fonts.conf, so it renders garbage and eats lots of CPU.

To use anything linked to fontconfig-2.11 you need to have this patch
applied to your running NixOS. That's why I'm pushing it to master
before the fontconfig update (as soon as I found and tested the fix).
2014-02-04 21:58:19 +01:00
Evgeny Egorochkin
60f9005fa7 exiv2: update from 0.23 to 0.24 2014-02-04 21:58:25 +02:00
Evgeny Egorochkin
b98014f7e5 openldap: update from 2.4.35 to 2.4.38 2014-02-04 21:58:25 +02:00
Evgeny Egorochkin
4ca25047d6 libassuan: update from 2.0.3 to 2.1.1 2014-02-04 21:58:25 +02:00
Sander van der Burg
81408168f2 nodejs: fix the patch to make it build on darwin 2014-02-04 18:03:21 +01:00
Shea Levy
5da2c77fbd telepathy-farstream: Bump.
Hopefully fixes the tested job

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-04 07:05:21 -05:00
Lluís Batlle i Rossell
627c82b991 gcc 4.8: no need for the arm eabi patch. 2014-02-04 10:18:27 +01:00
Lluís Batlle i Rossell
2ef5b4ec7c Updating tox/toxic 2014-02-04 10:12:28 +01:00
Shea Levy
bd996abc9c Haskell packages don't mix default.nix and <version>.nix in the same directory
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-03 18:56:27 -05:00
Shea Levy
bc6aa21b05 nodejs: Bump
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-03 18:40:04 -05:00
Shea Levy
41bbe377d3 libspotify: unmaintain
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-03 18:38:01 -05:00
Shea Levy
3c9ed5b51a http-parser: Bump
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-03 18:37:20 -05:00
Shea Levy
72b5403ee8 edk2/OVMF: Update
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-03 18:32:21 -05:00
Shea Levy
eb4e04c24f gcc-4.6: unmaintain
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-03 18:14:52 -05:00
Shea Levy
b47609410b ats: unmaintain
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-03 18:14:27 -05:00
Shea Levy
9cf29b7039 llvm: Propagate ncurses and zlib
Really shouldn't be needed with shared libs, should patch llvm-config

Fixes #1601

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-03 18:11:00 -05:00
Karn Kallio
b572051882 mlton: fix build with latest version. 2014-02-03 23:30:18 +01:00
Vladimír Čunát
3fe1656376 libav: bugfix updates for both branches; maintain 2014-02-03 21:43:55 +01:00
Bjørn Forsman
15eed826b6 psqlodbc: update from 8.3 to 9.3 (fixes build) 2014-02-03 21:08:27 +01:00
Peter Simons
c19547ad42 haskell-shelly: update to version 1.4.4 2014-02-03 18:30:02 +01:00
Peter Simons
a2d903d213 haskell-pipes-network: update to version 0.6.2 2014-02-03 18:30:02 +01:00
Peter Simons
dae7d83454 haskell-doctest: update to version 0.9.10.1 2014-02-03 18:30:02 +01:00
Peter Simons
55bcf1bcc5 haskell-atomic-primops: update to version 0.6 2014-02-03 18:30:02 +01:00
Peter Simons
aaa462c4bc haskell-abstract-deque: update to version 0.2.2.1 2014-02-03 18:30:02 +01:00
Bjørn Forsman
700c1323b8 sqliteodbc: fix library location
Commit d7d3c8fd828cf6aba4d511be1927458507422a67 (sqliteodbc: update to
0.995, add more metadata) mistakenly moved libraries from $out/lib to
$out (or rather stopped moving them from $out to $out/lib).

Move them back to $out/lib where they're expected to be and referred to
by the /etc/odbcinst.ini snippet.
2014-02-03 18:13:26 +01:00
Shea Levy
2cf7bc982b idris requires llvm-general-3.3 currently
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-02 20:40:29 -05:00
Shea Levy
134546bca2 clang: Fix linking with -flto
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-02 20:39:16 -05:00
Shea Levy
06ef22bcdd llvm-general: Fix build
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-02 20:36:50 -05:00
Shea Levy
86c587134b llvm-3.4: Try to fix build on darwin
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-02 19:47:59 -05:00
Peter Simons
710ddf7662 haskell-trifecta: update jail-breaking code 2014-02-02 23:36:22 +01:00
Peter Simons
c6053075bd haskell-hakyll: jailbreak to fix build with recent versions of regex-tdfa
https://github.com/NixOS/nixos/issues/281
2014-02-02 23:16:29 +01:00
Peter Simons
e3651da23e haskell-lens: add version 4.0 2014-02-02 22:36:13 +01:00
Peter Simons
422eda499e haskell-hlint: update to version 1.8.56 2014-02-02 22:36:13 +01:00
Peter Simons
4675368065 haskell-yesod-form: update to version 1.3.5 2014-02-02 22:36:13 +01:00
Peter Simons
012006bd96 haskell-yesod-core: update to version 1.2.6.6 2014-02-02 22:36:12 +01:00
Peter Simons
c21822f64f haskell-yesod-bin: update to version 1.2.5.8 2014-02-02 22:36:12 +01:00
Peter Simons
b5041566b4 haskell-web-routes: update to version 0.27.5 2014-02-02 22:36:12 +01:00
Peter Simons
1dfed43619 haskell-web-routes-boomerang: update to version 0.28.2 2014-02-02 22:36:12 +01:00
Peter Simons
c162ba42e5 haskell-warp: update to version 2.0.2.1 2014-02-02 22:36:12 +01:00
Peter Simons
f834ae003f haskell-snap: update to version 0.13.2.2 2014-02-02 22:36:12 +01:00
Peter Simons
b409b23fa0 haskell-shelly: update to version 1.4.3.1 2014-02-02 22:36:12 +01:00
Peter Simons
e78bcf3b16 haskell-safe: update to version 0.3.4 2014-02-02 22:36:12 +01:00
Peter Simons
99c930d791 haskell-pipes: update to version 4.1.0 2014-02-02 22:36:12 +01:00
Peter Simons
599d0e193c haskell-pipes-safe: update to version 2.0.2 2014-02-02 22:36:12 +01:00
Peter Simons
3212a49491 haskell-pipes-parse: update to version 3.0.0 2014-02-02 22:36:12 +01:00
Peter Simons
7ff0169247 haskell-pipes-concurrency: update to version 2.0.2 2014-02-02 22:36:12 +01:00
Peter Simons
dd5010edc9 haskell-pipes-bytestring: update to version 2.0.0 2014-02-02 22:36:12 +01:00
Peter Simons
cf68071ed1 haskell-pipes-aeson: update to version 0.2.1 2014-02-02 22:36:12 +01:00
Peter Simons
88c07a66b6 haskell-llvm-general: update to version 3.4.0.0 2014-02-02 22:36:12 +01:00