Mathijs Kwik
1a55c4b89f
Merge remote-tracking branch 'official/master' into multiple-outputs
...
Conflicts:
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/libpng/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/tools/typesetting/tex/texlive/default.nix
pkgs/top-level/all-packages.nix
2013-09-11 10:53:31 +02:00
Vladimír Čunát
aa8e8303e1
Merge branch 'x-updates' into master
2013-09-11 08:37:03 +02:00
Peter Simons
b728835bc1
Merge pull request #953 from errge/statvfs
...
Add statvfs haskell library
2013-09-10 15:32:34 -07:00
Peter Simons
e08fab28f5
Um, make that 'linuxHeaders26'. Sorry.
2013-09-10 21:16:33 +02:00
Peter Simons
5a75874b96
all-packages.nix: add 'linuxHeaders36' attribute
...
We have that version of the kernel headers in Nixpkgs already, there was
just no attribute for them.
2013-09-10 21:15:41 +02:00
Rickard Nilsson
d1882a1940
trac: Update to 1.0.1. The old version did not work at all with the current genshi package (0.7).
2013-09-10 19:19:27 +02:00
Eelco Dolstra
b73deae714
nix: Update to 1.6
2013-09-10 17:53:29 +02:00
Vladimír Čunát
bb6b42385d
Merge PR #901 : adding Storm
...
vcunat edit: use symlink instead of hardlink (failed for me with a
cross-device error), minor whitespace cleanup
2013-09-10 16:18:31 +02:00
Gergely Risko
b2c97f6ca5
Add statvfs haskell library
2013-09-10 16:06:56 +02:00
Eelco Dolstra
70fee5da11
Fix Nixpkgs evaluation
...
The evaluation of liferea causes an error:
error: assertion failed at `/tmp/nix-build-nixpkgs-tarball-1.0pre28992_1628c03.drv-0/git-export/pkgs/desktops/gnome-2/desktop/libgweather/default.nix:4:1'
Why this happens is a mystery, since liferea doesn't depend on
libgweather. The problem can be reproduced by evaluating:
builtins.toXML (import <nixpkgs> { system = "x86_64-darwin"; }).liferea
It seems to have something to do with builderDefs magic in webkit_gtk2.
http://hydra.nixos.org/build/6039089
2013-09-10 15:54:06 +02:00
Eelco Dolstra
64d648e92e
Update nixUnstable
2013-09-10 13:57:32 +02:00
Domen Kožar
1628c03c4e
upgrade deform and deform_bootstrap
2013-09-10 12:28:10 +02:00
Vladimír Čunát
ea8a7bcd0c
libav: update 9.8 -> 9.9
...
It's supposed to include some security-related fixes.
2013-09-10 10:42:33 +02:00
Peter Simons
aeefa7b070
Cabal-1.18.0: this version won't build without deepseq 1.3 or later
2013-09-09 15:07:38 +02:00
Peter Simons
66f905c14e
haskell-yesod-platform: update to version 1.2.4.2
2013-09-09 15:07:37 +02:00
Peter Simons
563786deff
haskell-unix-bytestring: update to version 0.3.7
2013-09-09 15:07:37 +02:00
Peter Simons
32d609654c
haskell-free: update to version 3.4.2
2013-09-09 15:07:37 +02:00
Peter Simons
bca133d225
haskell-dimensional: update to version 0.12.1.1
2013-09-09 15:07:37 +02:00
Peter Simons
7e8b474485
haskell-digestive-functors-heist: update to version 0.8.0.0
2013-09-09 15:07:37 +02:00
Peter Simons
09477f6002
haskell-HaRe: update to version 0.7.0.2
2013-09-09 15:07:36 +02:00
Peter Simons
28c5958658
haskell-thyme: disable the test suite some more
2013-09-09 15:07:36 +02:00
Peter Simons
0e7783c608
haskell-exceptions: re-generate with cabal2nix
2013-09-09 15:07:35 +02:00
Rob Vermaas
eac934c83a
Fix collectd, couldn't run due to missing pthread_cancel.
2013-09-09 13:05:50 +02:00
Rob Vermaas
3a8adb7014
Update nixops to 1.1
2013-09-09 13:03:59 +02:00
Peter Simons
0c5cf00829
tcpcrypt: add current HEAD of the Github master branch
2013-09-09 12:56:22 +02:00
Peter Simons
2282809b35
libnetfilter_queue: add version 1.0.2
2013-09-09 12:52:31 +02:00
Peter Simons
9f6d539707
cabal-install-1.18.0.1: this package requires Cabal 1.18.x to compile
2013-09-09 12:23:00 +02:00
Peter Simons
a9d625b3dc
haskell-tagsoup: Revert "update to version 0.13"
...
This reverts commit d0b0d530b6
. The new version
breaks the build of Pandoc.
2013-09-09 10:44:55 +02:00
Peter Simons
da69f13863
haskell-pandoc-types: Revert "update to version 1.12"
...
This reverts commit 17f8b63837
. The new version
breaks Pandoc, curiously enough. Who would have thought? Everyone seems to be
going Snoyman these days.
2013-09-09 10:43:15 +02:00
Peter Simons
b2a54d51b5
haskell-vault: jailbreak to fix build with older versions of GHC
2013-09-09 10:20:27 +02:00
Peter Simons
d58b4205c8
haskell-thyme: disable unit tests
...
https://github.com/liyang/thyme/issues/4
2013-09-09 10:02:30 +02:00
Peter Simons
2943574903
haskell-citeproc-hs: jailbreak to fix build with recent pandoc-types
2013-09-08 22:56:29 +02:00
Peter Simons
53f8f8f50d
haskell-digestive-functors-heist: jailbreak to fix the build with recent heist
2013-09-08 22:56:29 +02:00
Peter Simons
c8c7a8dc42
haskell-keter: update to version 1.0.1
2013-09-08 22:56:29 +02:00
Peter Simons
c690153d55
haskell-yesod: update to version 1.2.2.1
2013-09-08 22:56:29 +02:00
Peter Simons
39ac320e8e
haskell-yesod-platform: update to version 1.2.4.1
2013-09-08 22:56:29 +02:00
Peter Simons
fb3e61ffb8
haskell-yesod-form: update to version 1.3.2.1
2013-09-08 22:56:29 +02:00
Peter Simons
60264d6136
haskell-yesod-core: update to version 1.2.4.2
2013-09-08 22:56:28 +02:00
Peter Simons
8b15f9ce5a
haskell-yesod-bin: update to version 1.2.3.2
2013-09-08 22:56:28 +02:00
Peter Simons
699282966c
haskell-yesod-auth: update to version 1.2.2.1
2013-09-08 22:56:28 +02:00
Peter Simons
cd97281731
haskell-yaml: update to version 0.8.5
2013-09-08 22:56:28 +02:00
Peter Simons
be6549a4bf
haskell-xml-hamlet: update to version 0.4.0.5
2013-09-08 22:56:28 +02:00
Peter Simons
4b21c50856
haskell-wai-extra: update to version 1.3.4.5
2013-09-08 22:56:28 +02:00
Peter Simons
e890f1b66f
haskell-tls: update to version 1.1.5
2013-09-08 22:56:28 +02:00
Peter Simons
d0b0d530b6
haskell-tagsoup: update to version 0.13
2013-09-08 22:56:28 +02:00
Peter Simons
a09fda2838
haskell-snap: update to version 0.13.0
2013-09-08 22:56:28 +02:00
Peter Simons
629a868e6c
haskell-shakespeare: update to version 1.2.0
2013-09-08 22:56:28 +02:00
Peter Simons
c1a1f3c3ba
haskell-shakespeare-text: update to version 1.0.0.7
2013-09-08 22:56:28 +02:00
Peter Simons
54c362392f
haskell-shakespeare-js: update to version 1.2.0
2013-09-08 22:56:28 +02:00
Peter Simons
607da7c3c9
haskell-shakespeare-i18n: update to version 1.0.0.4
2013-09-08 22:56:27 +02:00