Commit Graph

23848 Commits

Author SHA1 Message Date
Eelco Dolstra
e4ce304333 types.nix: Add a ‘lines’ type
This is like types.string, but values are merged by putting a newline
in between them.  This is mostly useful for configuration file
options, where we don't want values accidentally ending up on the same
line.

Note that almost all options with string type in NixOS should either
be unmergable (i.e. should be marked with ‘types.uniq’) or should
actually be of type ‘lines’.  So it might make sense to remove the
merge function for the ‘string’ type eventually.
2013-02-11 15:32:24 +01:00
Eelco Dolstra
26dd2dc425 nixUnstable: Update to 1.4pre3056_79a3ba7 2013-02-11 15:27:18 +01:00
Peter Simons
8fa1ce00f2 petidomo: update to version 4.3 2013-02-11 14:38:02 +01:00
Peter Simons
18c24bab3f haskell-HTTP: update to version 4000.2.8 2013-02-11 11:16:36 +01:00
Michael Raskin
956f900331 Current Monotone needs older Boost 2013-02-11 01:18:59 +04:00
Shea Levy
e2abed75ec Revert "Revert "curl: Update to version 7.29.0.""
This reverts commit ec4f56b347.

With the added patch, the curl segfault seems to be fixed.
2013-02-10 13:44:00 -05:00
Александр Цамутали
1c515819ef e17: Update libs to 1.7.5, enlightenment to 0.17.1. 2013-02-10 21:23:45 +04:00
Shea Levy
ec4f56b347 Revert "curl: Update to version 7.29.0."
This reverts commit fd2cff9479.

nix's substituter fails with this curl, so revert it until that's fixed.
2013-02-10 11:37:14 -05:00
Shea Levy
9299b2ed3e Fix petidomo license meta attribute 2013-02-10 11:02:27 -05:00
Corey O'Connor
fde87b3a9b add winetricks, modified by vcunat@gmail.com
Originally from #89.
2013-02-10 16:20:24 +01:00
Peter Simons
09a3f9f775 haskell-gitit: update to version 0.10.2 2013-02-10 15:41:37 +01:00
Peter Simons
790af9124c haskell-digestive-functors: update to version 0.6.0.1 2013-02-10 15:41:37 +01:00
Vladimír Čunát
712af3a70f Merge pull request #243 from RSzibele/minetest-0.4.4
add minetest-0.4.4.
2013-02-10 03:08:40 -08:00
Lluís Batlle i Rossell
3c9386e19f Adding libeatmydata.
It doesn't run very well with our symlinks in PATH, but I don't know what
patch can make it work still. This is better than nothing; calling it
with its full path makes it work.
2013-02-10 00:08:29 +01:00
Peter Simons
f1b54f8ee2 mini-httpd: update to version 1.2 2013-02-09 22:50:50 +01:00
Shea Levy
1b4fc7a095 rng-tools: add meta.platforms 2013-02-09 15:09:46 -05:00
Peter Simons
28752752c0 boost: rename patch for version 1.47.0 to include its version number in the file name 2013-02-09 21:07:27 +01:00
Peter Simons
227dd2695c boost: remove obsolete version 1.52.0 2013-02-09 21:06:45 +01:00
Peter Simons
0edf39f1f8 boost-headers: remove obsolete version 1.49.0 2013-02-09 21:06:23 +01:00
Peter Simons
e0cb8cb5e4 boost: switch default version from 1.52.0 to 1.53.0 2013-02-09 21:05:39 +01:00
Peter Simons
37db55f3ec boost: remove obsolete version 1.51.0 2013-02-09 21:04:31 +01:00
Peter Simons
ad934df597 boost: remove obsolete version 1.46.0 2013-02-09 21:02:48 +01:00
Peter Simons
361b2facee petidomo: add version 4.2 2013-02-09 20:27:44 +01:00
Peter Simons
221e8b1649 haskell-stylish-haskell: update to version 0.5.6.0 2013-02-09 18:24:50 +01:00
Peter Simons
f5e1c00c68 haskell-snap-server: update to version 0.9.3.1 2013-02-09 18:24:50 +01:00
Peter Simons
e8de5bd8d9 haskell-snap-core: update to version 0.9.3.1 2013-02-09 18:24:50 +01:00
Peter Simons
587e82e085 haskell-reflection: update to version 1.1.7 2013-02-09 18:24:50 +01:00
Peter Simons
58eedef652 haskell-project-template: update to version 0.1.2 2013-02-09 18:24:50 +01:00
Peter Simons
e36304f903 haskell-hashtables: update to version 1.1.0.2 2013-02-09 18:24:50 +01:00
Peter Simons
fdf9782914 haskell-classy-prelude: update to version 0.5.0 2013-02-09 18:24:50 +01:00
Peter Simons
256a2997f2 haskell-classy-prelude-conduit: update to version 0.5.0 2013-02-09 18:24:50 +01:00
Peter Simons
1a5b329cfd haskell-base64-bytestring: update to version 1.0.0.1 2013-02-09 18:24:50 +01:00
Peter Simons
a49ff02e7f haskell-SDL-ttf: update to version 0.6.2 2013-02-09 18:24:50 +01:00
Peter Simons
4b3cd9711a haskell-HSH: update to version 2.1.0 2013-02-09 18:24:50 +01:00
Peter Simons
2191cbb0a1 haskell-darcs: update to version 2.8.4 2013-02-09 18:24:50 +01:00
Peter Simons
fcac0afb3a haskell-Agda: jailbreak to support the latest version of 'hashtables' 2013-02-09 18:17:32 +01:00
Peter Simons
89c34e18ce texLiveFull: add tex4ht 2013-02-09 18:13:06 +01:00
Peter Simons
93ce537e10 tex4ht: texLiveAggregationFun expects the texmf directory in $out, not $out/share
I also made some cosmetic changes to the expression.
2013-02-09 18:12:56 +01:00
Shea Levy
0f66b8cb20 gcc46_multi: Don't try to build on non-64-bit-linux 2013-02-09 10:01:02 -05:00
aszlig
fd2cff9479 curl: Update to version 7.29.0.
This version contains a security fix for CVE-2013-0249, for details please have
a look at:

http://curl.haxx.se/docs/adv_20130206.html

Thanks to @roconnor for pointing this out.

I'm pushing this to stdenv-updates because I'm not quite sure if it will break
other things because 7.29.0 is now non-blocking by default. Plus the security
vulnerability only affects IMAP, POP3 and SMTP protocol support.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

Cherry-picked into master, this won't change stdenv.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-02-08 18:27:52 -05:00
Shea Levy
831d72cede Update rubygems.
Particularly for rack-1.5.2, fixes CVE-2013-0263 and CVE-2013-0262.
2013-02-08 18:26:38 -05:00
Shea Levy
95452fa0f8 stdenv_32bit: Use gcc46_multi.
Fixes #80.
2013-02-08 14:58:30 -05:00
Shea Levy
86feda1106 Add multilib gcc-4.6.
libquadmath seems to require that the bootstrap gcc be multilib too.
2013-02-08 14:27:42 -05:00
aszlig
265fea5788
google-talkplugin: Note how to get latest version.
This is just in order to make it easier to determine the latest upstream version
from the Packages file of Google's APT repository.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 08:45:15 +01:00
aszlig
59d79e97e8
virtualbox: Fix unpacking of extension pack.
This fixes a typo introduced by 5a3f9c08b0.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 07:03:36 +01:00
aszlig
dd832a3e8f
chromium: Update beta channel to v25.0.1364.68.
This update is a bit more problematic, as the bundled version of libpng is
version 1.2.45 and the version in nixpkgs is 1.5.13. Even if trying to run with
libpng12 from nixpkgs, it seems to collide with parts of the bundled version.

So, until this is either fixed upstream or we have a good solution, we're using
bundled libpng for chromium version 25 and higher.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 07:03:36 +01:00
aszlig
9b726e94a8
chromium: Update stable channel to v24.0.1312.69.
Let's begin with the most trivial one: The stable version.
This version just contains a few bug fixes and builds fine so far.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 07:03:36 +01:00
aszlig
01cbb17c12
chromium: Fix updater to handle versions > 26.
Starting with version 26, there is a chromium-$version-lite package and it is an
LZMA archive as well, so download size is reduced by about 44%.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 07:03:36 +01:00
Shea Levy
8f51038a13 qemu-1.3.1
Also, old qemu is unreferenced in nixos and nixpkgs tree, so remove it absent explicit need.
2013-02-07 20:44:02 -05:00
Cillian de Róiste
a328bce51b Add Pillow, a fork of PIL (Python Imaging Library)
This fork is used by Plone and other Python web platforms/frameworks
because it is well maintained and setuptools friendly
2013-02-08 00:53:11 +01:00