Commit graph

3005 commits

Author SHA1 Message Date
Vladimír Čunát
d8a2ae8d01 some libintl and libiconv cleanups + non-linux fixes 2013-04-14 13:43:09 +02:00
Vladimír Čunát
17ae1617dc Merge branch 'master' into x-updates
Conflicts (systemd version is split on x-updates):
	pkgs/os-specific/linux/systemd/default.nix
2013-04-13 12:21:31 +02:00
Eelco Dolstra
4d5ba15ea9 openssh: Update to 6.2p1 2013-04-12 15:27:13 +02:00
Eelco Dolstra
8fc1fe9f6b socat: Update to 1.7.2.1
CVE-2012-0219
2013-04-12 15:01:01 +02:00
Eelco Dolstra
4adad458e7 Remove the "proprietary" license
We already had "unfree".
2013-04-12 14:37:50 +02:00
Vladimír Čunát
8249695b61 Merge branch 'master' into x-updates
Needed that to fix the tarball.
2013-04-11 23:31:33 +02:00
Cillian de Róiste
7f8ecc65ac hdf5: download URL no longer available for 1.8.5, upgrade to 1.8.10 2013-04-11 10:54:31 +02:00
Lluís Batlle i Rossell
91a94932d9 coreutils: fixing cross-build
coreutils can't generate the man pages cross-building. I do a trick
to get them from a non-cross-built coreutils.
2013-04-10 15:56:14 +02:00
Cillian de Róiste
277816eb00 lftp: update to 4.4.5 2013-04-10 14:13:27 +02:00
Rickard Nilsson
7870db8b10 unionfs: Add mount helper (mount.unionfs-fuse)
This makes it possible to mount unionfs directly with mount or fstab.

Example fstab entry:

  none /mnt/union unionf-fuse allow-other,dirs=/source1=RW,/source2=RW

Note, the dirs= option need to be the last option, due to limitations
in the mount helper provided by unionfs-fuse. Maybe we should write a
better helper ourselves.

Also, you need to specify your branches as dirs= option, NOT as
the device, since the latest version of libmount always interprets
"=" characters in the device name as a tag (like LABEL, UUID etc)
and will try to resolve the tag before calling the mount helper.
This will of course not succeed and the mount will fail.
2013-04-09 16:36:38 +02:00
Rickard Nilsson
08f1b426bc stunnel: Update to 4.56
Note, I had to add "fips = no" to my stunnel configuration after
the update.
2013-04-09 16:34:59 +02:00
Sergey Mironov
8b3b208f33 wicd: rename icons/hicolour to icons/hicolor 2013-04-09 09:27:45 +04:00
Peter Simons
48a2fb0aaa httpie: update to version 0.4.1 to fix the build 2013-04-08 01:19:20 +02:00
Peter Simons
2fe970d6f2 httpie: the build input 'requests014' doesn't exist anymore, it's now called 'requests' 2013-04-08 01:17:44 +02:00
Peter Simons
938486848e grub: fix download URL for grub-0.97-once.patch 2013-04-07 23:33:20 +02:00
Peter Simons
2879cf569e bup: update to version 0.25-rc1-107-g96c6fa2 and drop -Werror to fix the build
/nix/store/4jfqcb4mzh3vl08zgfh9ir46jii7rcb9-python-2.7.3/include/python2.7/modsupport.h:27:1: error: 'PyArg_ParseTuple' is an unrecognized format function type [-Werror=format=]
   PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...) Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3);
   ^
  cc1: all warnings being treated as errors
2013-04-07 23:33:19 +02:00
Domen Kozar
41c6d26e16 garden 2013-04-06 08:20:27 +02:00
Domen Kozar
130c081966 add thinkfan package 2013-04-06 00:34:50 +02:00
Eelco Dolstra
477c53cec0 sudo: Fix building outside of a chroot 2013-04-05 19:38:07 +02:00
Shea Levy
2d38aee71b xpra: Use new ffmpeg attribute
It still builds, but it's a pythonPackage so who knows if it works
right. Was breaking the tarball, though.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-05 06:49:23 -04:00
Vladimír Čunát
eb2e46aab2 Merge branch 'master' into x-updates
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
2013-04-04 21:43:40 +02:00
Sergey Mironov
18681ae58e wicd: remove unused patches, remove ast with plain rm 2013-04-04 13:44:43 +04:00
Cillian de Róiste
69ad5c5c04 Fix the path to ping
iputils-20101006/sbin/ping has moved to iputils-20121221/bin/ping
Wicd uses ping to test the connection and produced and error message.
2013-04-03 23:34:02 +02:00
Vladimír Čunát
96d5b0fc26 Merge pull request #419 from MarcWeber/submit/lprof
lprof: add
2013-04-03 08:15:30 -07:00
Vladimír Čunát
2cd7d9d29e Merge pull request #417 from the-kenny/g500-control
g500-control: add
2013-04-03 08:14:18 -07:00
Eelco Dolstra
91ff5e33cc sudo: Update to 1.8.7p7
Ouch, our sudo was criminally outdated.

CVE-2013-1775, CVE-2013-1776, CVE-2012-2337, CVE-2011-0010.
2013-04-03 13:15:38 +02:00
Cameron Matheson
934bfc618a tmux: update to version 1.8 2013-04-01 16:24:08 -06:00
Peter Simons
6382266e58 Merge pull request #431 from jcumming/cuetools.130317
cuetools-1.3.1
2013-04-01 02:39:17 -07:00
Peter Simons
7b6b0a85d4 Merge pull request #430 from orbitz/add-multitail-5.2.12
Add multitail
2013-04-01 02:36:57 -07:00
Jack Cummings
4527d677cc cuetools metadata: license, maintainer, platforms 2013-03-31 21:43:53 -07:00
Sergey Mironov
6901f6346d wicd: [HACK] fix various gtk issues
* hack around s.translate situation
* fix KeyError exception in error dialog
* fix Russian translation
2013-03-31 18:10:28 +00:00
Domen Kozar
ea4b0c33d8 Set correct paths when using nm-applet without desktop 2013-03-31 20:08:01 +02:00
Malcolm Matalka
d819ee8b7e Add multitail 2013-03-31 19:40:11 +02:00
Sergey Mironov
ee921d9df4 wicd: fix missing application icon 2013-03-31 13:06:31 +04:00
Sergey Mironov
f7efab5fd8 wicd: bring translations back. 2013-03-31 13:06:27 +04:00
Sergey Mironov
a8a3cc00fd wicd: fix dhclient interaction
wicd used to write dhclient config file into $out/var/lib/wicd directory attempting
to change nix-store. That didn't work and thats why we couldn't use dhclient.
With this patch wicd will generate temporary file name for this purpose. File is
generated each time the daemon starts.
2013-03-31 13:06:24 +04:00
Lluís Batlle i Rossell
6281042def Adding oath-toolkit and xmlsec
I added xmlsec to make it work with oath-toolkit (to build one extra tool
there, that I don't need), but I couldn't make it work together.
2013-03-31 00:08:17 +01:00
Domen Kožar
3c7ec2b559 Merge pull request #422 from offlinehacker/xpra-0.8.8
Upgrading xpra to 0.8.8
2013-03-30 07:45:40 -07:00
Jaka Hudoklin
06425fca37 Upgrading xpra to 0.8.8 2013-03-30 15:23:51 +01:00
Domen Kozar
9a31d2ef0d aircrack-ng: bump 2013-03-29 19:02:51 +01:00
Domen Kozar
92f72cb80f pwgen, wgetpaste: set platforms 2013-03-29 18:32:58 +01:00
Rob Vermaas
2fa4e36946 Add weighttp 0.3 2013-03-29 15:04:59 +01:00
Marc Weber
4926ad90e7 adding lprof 2013-03-29 14:52:47 +01:00
Moritz Ulrich
da90131e5a g500-control: Add meta.platforms.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-03-27 20:59:57 +01:00
Moritz Ulrich
e70954f8c8 New package: g500-control
g500-control is a small tool to configure internal profiles of a
Logitech G500 mouse.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-03-27 19:51:32 +01:00
Domen Kozar
c07d0b9b78 Add almir and it's dependencies. 2013-03-27 02:30:07 +01:00
Eelco Dolstra
5262980561 nixUnstable: Bump 2013-03-26 16:00:47 +01:00
Peter Simons
e825c522b6 Merge pull request #409 from pcapriotti/renameutils
Add renameutils package.
2013-03-25 11:40:36 -07:00
Lluís Batlle i Rossell
26ec1abf41 Adding Steam Locomotive, for the fun 2013-03-25 14:57:45 +01:00
Paolo Capriotti
f85025a30e Add renameutils package. 2013-03-25 13:45:01 +00:00
Vladimír Čunát
f8fb55b4cc gparted: update 2013-03-23 20:25:35 +01:00
Peter Simons
6fc2cccfe6 Add myself as a maintainer to all Haskell packages (re-)generated by hackage4nix. 2013-03-23 15:58:14 +01:00
Rok Garbas
fb1f25e532 Merge pull request #400 from iElectric/bacula_improvements
bacula: add postgresql support, add myself as maintainer and set meta.platforms
2013-03-22 05:14:37 -07:00
Peter Simons
7e24ae77fe latex2html: update to version 2008 2013-03-22 12:50:21 +01:00
Peter Simons
617394eaf8 latex2html: update meta information 2013-03-22 12:50:21 +01:00
Domen Kozar
1ee0f43bb1 bacula: add postgresql support, add myself as maintainer and set meta.platforms 2013-03-22 01:53:41 +01:00
Ludovic Courtès
31c513d4b7 gawk: Remove now-unneeded Cygwin patch. 2013-03-21 14:27:07 +01:00
Michael Raskin
3c1ce85692 Fix ZBar build by passing it gtk2 2013-03-21 11:59:07 +04:00
Michael Raskin
a9ec58c8b3 Fix pdf2djvu build via an update 2013-03-21 11:44:01 +04:00
Lluís Batlle i Rossell
ac807625a7 storebrowse: update fixing bugs
I try to add build rules for arm too.
2013-03-18 22:45:47 +01:00
Eelco Dolstra
93a963f347 nixUnstable: Update to the latest
This is mostly to get rid of those annoying Perl warnings in NixOS...
2013-03-18 22:35:33 +01:00
Lluís Batlle i Rossell
d711dcc070 Adding setup-hook for opensp, to set the sgml catalog files
This sets the SGML_CATALOG_FILES, similar to how libxml2 does the same with
XML_CATALOG_FILES.

I based the hook on the libxml2 one, and I followed the instructions about this
variable here:
http://docbook.sourceforge.net/release/dsssl/1.79/doc/install.html
2013-03-18 15:07:20 +01:00
Peter Simons
ac022ec7af smartmontools: update to version 6.1 (using latest drivedb.h revision 3797 from trunk) 2013-03-18 12:17:26 +01:00
Peter Simons
4fce144369 Merge pull request #387 from aforemny/cloc
Add cloc-1.58
2013-03-18 04:04:04 -07:00
Jack Cummings
dbee2b8ee9 cuetools-1.3.1 2013-03-17 16:18:36 -07:00
Jan Malakhovski
16972d2415 screen: fix some annoying bugs by importing patches from ArchLinux 2013-03-17 12:24:49 +00:00
Eelco Dolstra
82f947c78a runLaTeX: Fix dependency detection
Since Nix 1.4, expressions like "${path}/blabla" always evaluate to a
string rather than a path.  However, findLaTeXIncludes depended on the
old (weird) behaviour, leading to errors like:

  error: string `/nix/store/4c32q75in74m1148anlzdhb8jpppab0s-bla/IEEEtran.cls' cannot refer to other paths

So use path concatenation instead.
2013-03-16 16:56:19 +01:00
Lluís Batlle i Rossell
c9ffddb9d7 storebrowse: newer version 2013-03-16 15:15:38 +01:00
Alexander Foremny
4e5b7cd5d1 Add cloc-1.58 2013-03-16 15:06:23 +01:00
Cillian de Róiste
924be9b524 Wicd: #379 Also add the gtk-2.0 directory in pygobject to the PYTHONPATH 2013-03-16 08:34:14 +01:00
Lluís Batlle i Rossell
5bffa00f18 storbrowse: fix name 2013-03-16 01:42:49 +01:00
Lluís Batlle i Rossell
6ee91a0304 storebrowse: update
Easier to launch, dramatic improvement printing of the URL where to browse.
2013-03-16 01:40:47 +01:00
Lluís Batlle i Rossell
4dbdbda37f Adding storebrowse, a tool to browse the nix store with a web browser.
The build script is a bit long due to the upstream go style of things.
2013-03-16 00:59:25 +01:00
Eelco Dolstra
82dc43c28b checkinstall: Make installwatch.so work with old Glibcs 2013-03-15 14:04:32 +01:00
Eelco Dolstra
4c67972e9b checkinstall: Support Glibc >= 2.16 2013-03-15 14:04:32 +01:00
Cillian de Róiste
0037e518b0 Merge branch 'wicd-gobject' 2013-03-15 01:00:19 +01:00
Cillian de Róiste
ef3da5eecd #379 wicd: Add ifconfig and ping to the PATH
/var/log/wicd/wicd.log showed that it failed to find ifconfig
that was probably the main issue (after the gobject import failure)
2013-03-15 00:59:17 +01:00
Cillian de Róiste
2393f6b96f #379 Update wicd to 1.7.2.4, fix patches, disable translations 2013-03-15 00:14:30 +01:00
Rob Vermaas
629c36cfef rsyslog: enable TLS support 2013-03-14 15:27:34 +01:00
Rob Vermaas
4619675011 Add rsyslog 7.2.6 and its dependencies 2013-03-14 14:13:55 +01:00
Cillian de Róiste
0d191de368 Fix wicd to find the python gobject on its PYTHONPATH 2013-03-14 01:22:55 +01:00
Peter Simons
5f758431d4 lzip: build the binary with -O3 and assertions disabled 2013-03-13 15:13:40 +01:00
Peter Simons
c187516152 lzip: enable documentation build 2013-03-13 15:13:40 +01:00
Peter Simons
6d5c6af427 lzip: update to version 1.14 2013-03-13 13:59:33 +01:00
Lluís Batlle i Rossell
8d1ff12cdc mktorrent: fixing the usual pthread_cancel problem 2013-03-12 20:01:07 +01:00
Lluís Batlle i Rossell
90bca24b38 Adding mktorrent 1.0 2013-03-12 19:43:57 +01:00
Peter Simons
746bf427a8 pkgs/tools/networking/snx/snx_install.sh: delete file accidentally checked in earlier 2013-03-11 11:01:28 +01:00
Shea Levy
86aa2853f6 Merge branch 'graphviz-vimdot-fix' of git://github.com/bjornfor/nixpkgs
Branch contains a trivial fix.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-10 22:06:04 -04:00
Peter Simons
f59aaaed4b smartmontools: update drivedb.h to the latest version 2013-03-10 00:43:08 +01:00
Bjørn Forsman
74d6315024 graphviz: fix vimdot program
vimdot doesn't work at the moment because one of its dependencies,
'which', is missing; vimdot fails to find gvim or vim and aborts.
Instead of adding a dependency on 'which', replace it with the POSIX
command 'command -v'.
2013-03-09 21:45:20 +01:00
Vladimír Čunát
56b4a71c21 netpbm: update and attempt to fix i686 build 2013-03-09 14:59:39 +01:00
Vladimír Čunát
2e1dd8e076 recutils: supply the forgotten patch 2013-03-09 13:54:55 +01:00
Michael Raskin
5ec1806564 Adding ZPAQ archiver 2013-03-09 16:33:14 +04:00
Michael Raskin
b494b3b468 Update lrzip 2013-03-09 16:33:14 +04:00
Vladimír Čunát
87ec597ce7 recutils: fix build with new glibc 2013-03-09 13:24:31 +01:00
Vladimír Čunát
e218c79b85 grive: fix build with new binutils headers 2013-03-09 12:27:38 +01:00
Vladimír Čunát
f0f34067e7 recode: fix build after stdenv merge + #354
ToDo: tests don't pass yet.
2013-03-09 11:32:22 +01:00
Michael Raskin
dcf04b6063 zbar requires v4l1; disabe video 2013-03-09 12:59:45 +04:00
Shea Levy
8934644d20 tor: minor cleanups
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:15:26 -05:00
Shea Levy
9a5ca5aced tor: Don't use NIX_CFLAGS_LINK where CFLAGS will do 2013-03-08 19:14:43 -05:00
Shea Levy
35d957b8f9 Merge branch 'tor.130308' of git://github.com/jcumming/nixpkgs
This commit ensures tor is linked to lgcc_s. Tests didn't pass before,
pass now.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:13:17 -05:00
Shea Levy
9158ad45f1 Merge branch 'xchainkeys' of git://github.com/iyzsong/nixpkgs
This adds a new package, xchainkeys. It builds, so I ship.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:08:56 -05:00
Shea Levy
064155ad38 Merge branch 'recode.130306' of git://github.com/jcumming/nixpkgs
Attempts to fix recode build on darwin, verified by inspection (don't
have a readily available darwin machine for testing right now, will let
hydra see if this worked).

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 18:22:13 -05:00
Shea Levy
1de517844b Whoops, buildNativeInputs is now nativeBuildInputs 2013-03-08 16:39:09 -05:00
Shea Levy
b938cacbe1 tmux: Update to 1.7 2013-03-08 15:49:22 -05:00
Jack Cummings
e863477995 need to link against -lgcc_s for the testsuite to work 2013-03-08 07:43:30 -08:00
David Guibert
856f6c2aea fix iftop 2013-03-08 09:08:57 +01:00
Song Wenwu
9cbcbc5323 add xchainkeys-0.11 2013-03-08 13:55:32 +08:00
Eelco Dolstra
234c6b74c6 Merge remote-tracking branch 'origin/stdenv-updates' 2013-03-07 23:09:05 +01:00
Lluís Batlle i Rossell
197f6c6c4c idle3-tools can build only on linux, I think. 2013-03-07 22:39:53 +01:00
Lluís Batlle i Rossell
78e71242d7 Adding idle3-tools (for WD Green HDDs) 2013-03-07 21:40:28 +01:00
Eelco Dolstra
674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Jack Cummings
a1c4fa8edc recode: attempt to fix Darwin testsuite build problem 2013-03-06 10:12:21 -08:00
Eelco Dolstra
92656e5f52 coreutils: Update to 8.21
Now "df" finally hides bind mounts and rootfs!
2013-03-06 14:10:54 +01:00
Jack Cummings
ed99c87a26 get recode testsuite running. 2013-03-06 01:07:54 -08:00
Jack Cummings
e61bdcfacd recode-3.7-git 2013-03-05 14:31:51 -08:00
Vladimír Čunát
26af997d41 Merge branch 'master' into stdenv-updates
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
Vladimír Čunát
c8b940072d koffice, kbluetooth: remove from hydra 2013-03-02 09:21:11 +01:00
Lluís Batlle i Rossell
097705cd86 virtualgl: fixing and updating to 2.3.2 2013-03-01 10:18:00 +01:00
Eelco Dolstra
1166b82fca nix: Update to 1.5.1 2013-03-01 02:03:09 +01:00
Vladimír Čunát
fc82aa049b hddtemp: try to fix by Gentoo patches 2013-02-28 16:00:49 +01:00
Vladimír Čunát
c0f6910758 fuse_zip: fix with new libzip 2013-02-28 15:43:06 +01:00
Eelco Dolstra
adef38370c nix: Update to 1.5 2013-02-28 01:20:39 +01:00
Rickard Nilsson
ad76386ff7 Add mkpasswd, an overfeatured front end to crypt 2013-02-27 12:14:09 +01:00
Eelco Dolstra
5847037d84 nix: Update to 1.4 2013-02-26 14:41:02 +01:00
Peter Simons
5f32207dfc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
Vladimír Čunát
f20ff74afe recode: fix with new automake 2013-02-24 16:40:36 +01:00
Vladimír Čunát
4768a0cea6 netboot: change to a fixed version, fix build 2013-02-23 23:19:35 +01:00
Vladimír Čunát
e469bc503e kdePackages.partitionManager: fix via update to Gentoo version 2013-02-23 20:32:54 +01:00
Vladimír Čunát
0eeae100fd wv2: update and fix 2013-02-23 19:29:02 +01:00
Vladimír Čunát
350bd42274 opensc stuff: fix some packages by updating 2013-02-23 14:00:49 +01:00
Rok Garbas
6b30610672 offlineimap: updating license and add myself as maintainer 2013-02-23 10:55:11 +01:00
Rok Garbas
71a9716fd4 offlineimap: update to 6.5.5-rc2 2013-02-23 10:51:14 +01:00
Shea Levy
c3a55db090 bacula: Remove some duplication to avoid errors when updating. 2013-02-22 15:24:20 -05:00
Bjørn Forsman
2c4d695a1b bacula: fix version mismatch between name and src attribute
Commit 207443b184 ("upgrade bacula")
updated the backula version in the src attribute but forgot to update
the version number in the name attribute.
2013-02-22 21:05:40 +01:00
cillianderoiste
33eae7dfec Merge pull request #330 from iElectric/bacula
upgrade bacula
2013-02-21 13:51:28 -08:00
Cillian de Róiste
c2ba006ec9 aespipe: Fix typo in maintainer id 2013-02-21 22:30:14 +01:00
Domen Kozar
207443b184 upgrade bacula 2013-02-21 21:18:26 +01:00
Shea Levy
754f9a44fd Gummiboot: Update to 23.
Requires a corresponding change in nixos to work there.
2013-02-21 12:39:25 -05:00
Eelco Dolstra
f9c4ce79c8 Comment out non-existent maintainer attribute
http://hydra.nixos.org/build/4191101
2013-02-21 17:48:46 +01:00
Shea Levy
acd4299e75 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
2013-02-21 11:13:30 -05:00
Peter Simons
45eb9f5589 snx: add version 800007027 of the CheckPoint SSL Network Extender 2013-02-21 15:56:16 +01:00
Peter Simons
0d7f427620 davfs2: read config files from /etc/davfs2 instead of ${out}/etc/davfs2
This patch makes the 'noDavsUser' argument to the build expression obsolete.
2013-02-21 12:03:52 +01:00
Shea Levy
aacca1902c Merge branch 'upstream-master' into stdenv-updates 2013-02-19 10:09:39 -05:00
Eelco Dolstra
3a1d3990e5 openssh: Just use a mirror of the HPN patch 2013-02-19 11:03:10 +01:00
Lluís Batlle i Rossell
cde20d6951 Fixing openssh hpn support for 6.1p1
I had to write a weird download derivation to overcome their download procedure.
2013-02-19 10:50:50 +01:00
Cillian de Róiste
4400a752e9 Add aespipe, an AES encrypting or decrypting pipe 2013-02-18 22:47:55 +01:00
Cillian de Róiste
f81dbf4893 wicd: NixOS/nixos#88 add resolvconf to PATH for wicd
with this patch resolvconf is used to set the DNS via wicd, although
this doesn't seem to stop dhcpcd from clobbering /etc/resolv.conf
2013-02-18 21:46:15 +01:00
Peter Simons
9e68734d61 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-18 11:54:56 +01:00
Bjørn Forsman
52531cef21 file: bump from 5.11 to 5.12 2013-02-18 11:46:47 +01:00