Peter Simons
7bef7e8535
haskell-tasty-rerun: update to version 1.1.0
2014-01-26 00:02:35 +01:00
Peter Simons
5f2f85508a
haskell-tagsoup: update to version 0.13.1
2014-01-26 00:02:35 +01:00
Peter Simons
979c1bfe89
haskell-stm-conduit: update to version 2.2.1
2014-01-26 00:02:35 +01:00
Peter Simons
20ef7553aa
haskell-network-conduit: update to version 1.0.1.1
2014-01-26 00:02:34 +01:00
Peter Simons
4ba8a711a2
haskell-monadcryptorandom: update to version 0.6
2014-01-26 00:02:34 +01:00
Peter Simons
43e713b94a
haskell-mmorph: update to version 1.0.2
2014-01-26 00:02:34 +01:00
Peter Simons
1e610c8822
haskell-hoodle-builder: update to version 0.2.2.0
2014-01-26 00:02:34 +01:00
Peter Simons
e7bc87c7d3
haskell-hjsmin: update to version 0.1.4.5
2014-01-26 00:02:34 +01:00
Peter Simons
6a540116e6
haskell-hit: update to version 0.5.2
2014-01-26 00:02:34 +01:00
Peter Simons
c18cc5d6e8
haskell-heist: update to version 0.13.0.6
2014-01-26 00:02:34 +01:00
Peter Simons
ac1010b3ba
haskell-hakyll: update to version 4.4.3.2
2014-01-26 00:02:34 +01:00
Peter Simons
855b5adf2d
haskell-github: update to version 0.7.4
2014-01-26 00:02:34 +01:00
Peter Simons
1cf170a806
haskell-digestive-functors: update to version 0.7.0.0
2014-01-26 00:02:34 +01:00
Peter Simons
312624f223
haskell-digestive-functors-snap: update to version 0.6.1.0
2014-01-26 00:02:34 +01:00
Peter Simons
f00962f10b
haskell-digestive-functors-heist: update to version 0.8.4.1
2014-01-26 00:02:34 +01:00
Peter Simons
a8e1a6d4d8
haskell-digestive-functors-aeson: update to version 1.1.4
2014-01-26 00:02:34 +01:00
Peter Simons
a1364bb9b1
haskell-conduit: update to version 1.0.12
2014-01-26 00:02:34 +01:00
Peter Simons
aeb987d68c
haskell-cipher-aes128: update to version 0.6.4
2014-01-26 00:02:34 +01:00
Peter Simons
2eb23f599b
haskell-cassava: update to version 0.3.0.1
2014-01-26 00:02:34 +01:00
Peter Simons
2b039e3f2b
haskell-blaze-markup: update to version 0.6.0.0
2014-01-26 00:02:34 +01:00
Peter Simons
3c3c2c642c
haskell-blaze-html: update to version 0.7.0.0
2014-01-26 00:02:34 +01:00
Peter Simons
42dd05709c
haskell-atto-lisp: update to version 0.2.1.2
2014-01-26 00:02:34 +01:00
Peter Simons
a1d67d5996
haskell-atomic-primops: update to version 0.5
2014-01-26 00:02:34 +01:00
Peter Simons
6e0de16709
haskell-JuicyPixels: update to version 3.1.3.1
2014-01-26 00:02:33 +01:00
Peter Simons
0a193cc5e1
haskell-HTF: update to version 0.11.1.0
2014-01-26 00:02:33 +01:00
Peter Simons
0cfd7ed723
haskell-Chart: update to version 1.2
2014-01-26 00:02:33 +01:00
Peter Simons
20929da52c
haskell-Chart-gtk: update to version 1.2
2014-01-26 00:02:33 +01:00
Peter Simons
2e648757a8
haskell-Chart-cairo: update to version 1.2
2014-01-26 00:02:33 +01:00
Peter Simons
ea288d47bd
haskell-Elm: update to version 0.11
2014-01-26 00:02:33 +01:00
Peter Simons
e2a858379d
haskell-git-annex: update to version 5.20140116
2014-01-26 00:02:33 +01:00
Vladimír Čunát
f5f802bca3
libusb1: name it libusbx, so it's more clear
...
(cherry picked from commit b187d0e1bd
)
2014-01-25 21:01:40 +01:00
Nixpkgs Monitor
c1db67ea99
harfbuzz: update from 0.9.24 to 0.9.25
...
I see no significant change in the changelog.
(cherry picked from commit 29a878d1be
)
2014-01-25 21:01:40 +01:00
Vladimír Čunát
ac07b3d37f
gtk3: bugfix update 3.10.5 -> .6
2014-01-25 21:01:40 +01:00
Vladimír Čunát
c9b581b5d4
wayland: update 1.3.0 -> 1.4.0
2014-01-25 21:01:40 +01:00
Peter Simons
b3fe70a5e8
popa3d: disown this package
2014-01-25 20:59:31 +01:00
Peter Simons
a8f8ac72a3
apparmor: build with bison 2.x; version 3.x causes compiler errors
2014-01-25 20:58:49 +01:00
Peter Simons
58f1520726
lxc: update from 1.0.0.beta1 to 1.0.0.beta2
2014-01-25 20:58:49 +01:00
Peter Simons
f6e18d1d43
popa3d: update from 1.0.2 to 1.0.3
2014-01-25 20:58:49 +01:00
Peter Simons
5fefec3944
pspp: update from 0.8.1 to 0.8.2
2014-01-25 20:58:49 +01:00
Peter Simons
4a17e1be93
youtubeDL: update from 2014.01.20 to 2014.01.23.1
2014-01-25 20:58:48 +01:00
Eelco Dolstra
f03ca20916
libreoffice: Fix path to the JDK
2014-01-25 18:29:21 +01:00
Petr Rockai
cf7ee03377
photivo: Fix paths.
2014-01-25 18:08:47 +01:00
Petr Rockai
2953c39409
photivo: Update.
2014-01-25 18:08:47 +01:00
Domen Kožar
09e7489ddc
Merge pull request #1588 from ocharles/pythonPackages.tarsnapper
...
pythonPackages.tarsnapper: New expression
2014-01-25 09:08:25 -08:00
Cillian de Róiste
3ee043da54
pianobooster: patch to build with gcc4.7, wrap it so it finds libGL.so.1
...
Also add linux as a platform.
Patches from:
https://github.com/gbin/gbin-overlay/tree/master/media-sound/pianobooster
2014-01-25 17:54:57 +01:00
Domen Kožar
dd409f09d6
add ibus
2014-01-25 17:06:05 +01:00
Peter Simons
4230c95d56
Re-generate some Haskell expressions with cabal2nix.
2014-01-25 16:48:29 +01:00
Petr Rockai
031c229cc0
haskell: Add an atto-lisp package.
2014-01-25 16:37:21 +01:00
Petr Rockai
853eaaa69c
perl-Mojolicious: A real-time web framework.
2014-01-25 16:37:21 +01:00
Petr Rockai
fb4ff01e1a
perl-Devel-SizeMe: A module for dumping heap use and structure.
2014-01-25 16:37:21 +01:00
Petr Rockai
ed5bd26574
STP: Simple Theorem Prover (a SMT solver for bitvectors & arrays).
2014-01-25 16:33:12 +01:00
Petr Rockai
e3fae16a29
emacs: Allow non-GTK X11 builds (--with-x-toolkit=lucid).
2014-01-25 16:30:14 +01:00
Petr Rockai
251fc454ba
mpc: (mpd client) Update to 0.25.
2014-01-25 16:30:14 +01:00
Petr Rockai
28f0ec6540
linux-perf: Fix build (unportable shell hack broke).
2014-01-25 16:30:14 +01:00
Petr Rockai
3718a90806
haskell bytestring-progress: Disable haddock to avoid a build failure.
2014-01-25 16:30:14 +01:00
Vladimír Čunát
83b354e4f9
linuxHeaders: add meta, incl. platforms = linux;
...
Noted by @mornfall. The built package has ~5 MB uncompressed,
but just the Linux tarball has ~40 MB compressed...
2014-01-25 15:35:52 +01:00
Eelco Dolstra
07a3993e14
libreoffice: Fix path to Ant
2014-01-25 14:19:42 +01:00
Bjørn Forsman
958d6636a7
networkmanager: fix path to 'openconnect' binary
...
Without this the openconnect VPN plugin doesn't work:
NetworkManager[830]: <warn> VPN connection 'Foo VPN' failed to connect: 'Could not find openconnect binary.'.
2014-01-25 13:59:10 +01:00
Peter Simons
a1f7094b98
Merge pull request #1583 from MarcWeber/submit/drop-myhasktags
...
drop myhasktags, current hackage version has everything my version had
2014-01-25 04:24:12 -08:00
Bjørn Forsman
4d027a44f6
openconnect: update from 5.01 to 5.02 (CVE-2013-7098)
...
OpenConnect v5.02 - 2014-01-01:
* Fix XML POST issues with authgroups by falling back to old style login.
* Fix --cookie-on-stdin with cookies from ocserv.
* Fix reconnection to wrong host after redirect.
* Reduce limit of queued packets on DTLS socket, to fix VoIP latency.
* Fix Solaris build breakage due to missing <string.h> includes.
* Include path in <group-access> node.
* Include supporting CA certificates from PKCS#11 tokens (with GnuTLS 3.2.7+).
* Fix possible heap overflow if MTU is increased on reconnection (CVE-2013-7098).
2014-01-25 13:21:44 +01:00
Oliver Charles
ee26cdd389
perlPackages.LWPUserAgentMockable: Disable tests
...
These tests need network connectivity, which isn't available in a
chroot'ed environment (at least, it's not available on Hydra build machines).
2014-01-25 11:56:02 +00:00
Oliver Charles
0ff30b7925
perlPackages.HTMLFormHandler: Upgrade to 0.40055
2014-01-25 11:46:03 +00:00
Oliver Charles
c3b4e87f25
haskellPackages.ariadne: Fix dependencies to allow building
2014-01-25 11:27:33 +00:00
Oliver Charles
8ab1160079
pythonPackages.tarsnapper: New expression
2014-01-25 10:30:35 +00:00
Andraz Brodnik
47ac1f38cd
Added beep to top-level.
2014-01-25 10:35:02 +01:00
Andraz Brodnik
0121ee33d8
Add the beep-1.3.
2014-01-25 10:35:02 +01:00
Bjørn Forsman
c72ce740bc
cgal: expression cleanup
2014-01-25 10:19:04 +01:00
Bjørn Forsman
97352b1342
cgal: update from 3.9 to 4.3 (really)
...
The previous version bump didn't actually do anything; it changed the
version/url but didn't change the hash. For some reason the (new) URL
returned the same old package with the same old hash (or so it seems).
This time the package is really updated, as can be seen from the version
number in $cgal/include/CGAL/version.h.
This change unbreaks openscad.
2014-01-25 10:18:58 +01:00
Eelco Dolstra
458d0a92c9
junixsocket: Add
2014-01-25 03:04:46 +01:00
Eelco Dolstra
1b598da460
Drop unnecessary setting of java.home
2014-01-25 03:04:46 +01:00
Eelco Dolstra
981cac8e10
openjdk: Hackery to ensure that tools.jar is found
...
HotSpot uses the absolute path of libjvm.so to determine the java.home
property (ignoring $JAVA_HOME), which is in turn used by
ToolProvider.getSystemJavaCompiler() to load tools.jar. So we need to
do some trickery to ensure that if java gets invoked from the jdk
output (ratherthan the jre output), it finds libjvm.so in the jdk output.
2014-01-25 03:04:46 +01:00
Eelco Dolstra
e07ce3314d
Fix some "meta.licenses" attributes
2014-01-25 03:04:46 +01:00
Eelco Dolstra
a17b090f99
junit: Update to 4.11
2014-01-25 03:04:46 +01:00
Rob Vermaas
13e13f279b
Do not assume a .rev attribute in available in src in maven-build.nix
2014-01-24 15:52:31 +01:00
Domen Kožar
f2d6166781
python-libarchive: 3.0.4-5 -> 3.1.2-1
2014-01-24 14:33:41 +01:00
Domen Kožar
8a5c65abf4
mailpile: update dev version
2014-01-24 14:33:40 +01:00
Domen Kožar
c4cb65187e
i3: 4.6 -> 4.7.2
2014-01-24 14:33:40 +01:00
Domen Kožar
a5b054e18a
xfce4-screenshooter: add platforms.linux
2014-01-24 14:33:40 +01:00
Peter Simons
a86f119dfc
haskell-either: disable the documentation build on GHC 7.4.x or earlier
2014-01-24 00:58:50 +01:00
Peter Simons
6968277785
maude: build with bison 2.x; version 3.x causes compiler errors
2014-01-23 23:28:20 +01:00
Vladimír Čunát
343cd5b1ef
midori: minor update 0.5.6 -> .7
2014-01-23 22:29:25 +01:00
Song Wenwu
04a55b5e14
webkitgtk: update to 2.2.4, enable html5 video support
2014-01-23 22:29:24 +01:00
Nixpkgs Monitor
7a211df849
wget: update from 1.14 to 1.15
2014-01-23 21:10:55 +02:00
Evgeny Egorochkin
862ac34bdd
wineUnstable: update from 1.7.10 to 1.7.11
2014-01-23 21:04:01 +02:00
Evgeny Egorochkin
f8f8e8d4d2
clamav: update from 0.98 to 0.98.1
2014-01-23 20:55:31 +02:00
Evgeny Egorochkin
f0081dcc02
youtubeDL: update from 2014.01.08 to 2014.01.20
2014-01-23 20:52:59 +02:00
Sander van der Burg
b25529a4ad
titaniumsdk: colored output makes a web server think that logs are in raw format. So disable it
2014-01-23 17:11:16 +01:00
Sander van der Burg
1a24278161
titaniumsdk: Add additional login simulation for the ipa target
2014-01-23 15:11:46 +01:00
Marc Weber
0d0eb44a35
drop myhasktags, current hackage version has everything my version had
2014-01-23 14:44:21 +01:00
Eelco Dolstra
230a00f644
findbugs: Clean up packaging
...
Most stuff is now hidden under $out/libexec/findbugs, with only a few
JARs exported via $out/share/java. Also, the setup hook sets
FINDBUGS_HOME.
2014-01-23 14:17:44 +01:00
Jaka Hudoklin
e0000f8ad1
ati-drivers: update to 13.12 ( close #1569 )
...
This update is mostly effort from @MarcWeber and @vcunat, now tested on real
hardware making sure it works with multiple GPUs and opencl.
2014-01-23 12:11:28 +01:00
Peter Simons
f5461b02d5
serf: fix evaluation on FreeBSD (required for Subversion)
2014-01-23 11:57:37 +01:00
Eelco Dolstra
6a8485af6b
clang-wrapper: Set $CXX to clang
...
This is useful for non-Autoconf-based packages, since GNU Make's
default for CXX is "g++". (The CC default is "cc" so should work fine
with Clang already.)
2014-01-23 11:24:17 +01:00
Eelco Dolstra
c07559b782
sudo: Update to 1.8.9p4
2014-01-23 11:21:38 +01:00
Eelco Dolstra
f4af2a8737
clang-wrapper: Sync with gcc-wrapper
2014-01-23 10:57:49 +01:00
Shea Levy
3b20a10ae9
Fix tarball
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-22 15:54:40 -05:00
Michael Raskin
9e42b753a7
Merge pull request #1561 from wizeman/u/ipmiutil
...
ipmiutil: Update from 2.7.3 -> 2.9.2 and simplify
2014-01-22 12:32:18 -08:00
Michael Raskin
77fa75b1ba
Merge pull request #1572 from bennofs/update-java7
...
java: Update to version 7u51
2014-01-22 12:29:23 -08:00
Benno Fünfstück
42fb68d6a9
java: Update to version 7u51
2014-01-22 21:22:18 +01:00
Shea Levy
058fd7eeea
Merge branch 'master' of git://github.com/madjar/nixpkgs
...
rust: fixed i686 build
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-22 13:33:02 -05:00
Georges Dubus
f8afc745bf
rust: fixed i686 build
2014-01-22 19:29:20 +01:00
Rob Vermaas
004b8d24f6
Merge pull request #1564 from aristidb/master
...
fix keepassx under gcc 4.8
2014-01-22 10:17:38 -08:00
Domen Kožar
c1811d0304
Add pythonPackages.pyramid_chameleon and disable tests for zope_testrunner
2014-01-22 18:19:07 +01:00
Georges Dubus
49dd0867a7
rust: Fixed build
2014-01-22 16:36:05 +01:00
Georges Dubus
6eed023894
rust: patched the source to hardcode gcc path
...
to avoid using a wrapper.
2014-01-22 13:33:04 +01:00
Georges Dubus
35aa131371
rust: fixed build for i686 and maybe darwin
2014-01-22 13:33:04 +01:00
Peter Simons
ff8cffed86
subversion: fix evaluation errors on FreeBSD
2014-01-22 12:44:49 +01:00
Peter Simons
37cc0df1bf
silgraphite: fix evaluation errors on Darwin
2014-01-22 12:43:01 +01:00
Domen Kožar
5b982bd090
nss: patch http location moved, let's keep it in filesystem
2014-01-22 10:46:37 +01:00
cillianderoiste
fc1ae3f6b5
Merge pull request #1568 from urv/master
...
rockbox-utility: upgrade 1.3.1 -> 1.4.0
2014-01-22 01:21:16 -08:00
Domen Kožar
15006a1788
mailpile: add spambayes dependency to spam/ham emails
2014-01-22 08:06:18 +01:00
Evgeny Egorochkin
9b538a96f1
nagios-plugins: change source location and homepage since the original site has been hijacked. https://bugzilla.redhat.com/show_bug.cgi?id=1054340
2014-01-22 08:42:35 +02:00
Arvin Moezzi
96e933a36f
rockbox-utility: upgrade 1.3.1 -> 1.4.0
2014-01-22 06:40:32 +01:00
Shea Levy
ca116f76f9
Unmaintain a bunch of packages
...
Trying to take maintainership more seriously...
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-21 22:34:41 -05:00
Shea Levy
cb9cc87a39
kernel.passthru: Don't include meta to be consistent with stdenv.mkDerivation
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-21 21:12:58 -05:00
Shea Levy
fd999ed570
Linux: Set passthru attr to contain full passthru
...
This fixes #1566 , thanks @wizeman
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-21 21:06:27 -05:00
Ricardo M. Correia
aeda8d63b9
grsecurity: Update stable and test patches
...
stable: 3.0-3.2.53-201312021727 -> 3.0-3.2.54-201401191012
test: 3.0-3.12.2-201312021733 -> 3.0-3.12.8-201401191015
2014-01-22 02:14:35 +01:00
Ricardo M. Correia
fd896d09fa
grsecurity: Fix build under new generic kernel derivation
2014-01-22 02:14:35 +01:00
Shea Levy
d18bc25b95
Rename linuxManualConfig to buildLinux
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-21 20:05:55 -05:00
Aristid Breitkreuz
5acc2fef25
fix keepassx under gcc 4.8
2014-01-21 22:20:21 +01:00
Shea Levy
c373a49b10
Use gcc48_multi for stdenv_32bit
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-21 16:12:41 -05:00
Shea Levy
6bdafbad9b
Build static libs with gcc
...
This was the behavior pre stdenv-updates and is needed by some users
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-21 16:11:29 -05:00
Shea Levy
a34d00f3b4
Fix tarball
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-21 14:39:33 -05:00
Peter Simons
cb21683794
ghc: disable parallel building
...
It sucks, I know, but GHC just doesn't compile reliably when built with
some -j<n> option. :-( We have build errors because of apparent race
conditions all over the place on Hydra. This causes so much trouble for
users that it's not worth keeping this option enabled, IMHO.
2014-01-21 20:35:49 +01:00
Peter Simons
712458c3fc
all-packages.nix: remove redundant texinfo5 overrides
...
Texinfo 5.x is the default version now.
2014-01-21 20:29:34 +01:00
Peter Simons
3d8b0401c2
eukleides: build with texinfo 4.x; version 5 doesn't succeed
2014-01-21 20:26:45 +01:00
Peter Simons
397550afe5
geoip: update from 1.4.6 to 1.6.0
2014-01-21 20:25:52 +01:00
Peter Simons
ab8c539049
gdbm: update from 1.10 to 1.11
2014-01-21 20:20:29 +01:00
Peter Simons
4e983788cd
feh: update from 2.8 to 2.9.3
2014-01-21 20:19:21 +01:00
Peter Simons
c1209b5144
emacs-bbdb: update to version 2.36
2014-01-21 20:18:27 +01:00
Peter Simons
7b2c1b854e
snx: disown this package
2014-01-21 20:08:41 +01:00
Peter Simons
95934138bc
gprolog: patch hard-coded path to the temporary file /tmp/make.log
2014-01-21 20:07:26 +01:00
Sander van der Burg
eb85038518
titaniumsdk: Replace deprecated python build tools by the new NodeJS based tool
2014-01-21 17:19:26 +01:00
Shea Levy
6731ed2b86
Fix tarball
...
Hopefully this kind of thing won't be needed with nix 1.7
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-21 09:53:21 -05:00
Ricardo M. Correia
5d46e7cf28
ipmiutil: Update from 2.7.3 -> 2.9.2 and simplify
2014-01-21 14:27:52 +01:00
Eelco Dolstra
f5773e1f02
gcc-4.8: Enable Darwin and FreeBSD
2014-01-21 14:23:27 +01:00
Domen Kožar
357a789366
gnome3: remove librsvg with gtk2
2014-01-21 14:11:20 +01:00
Domen Kožar
12b6786c65
gnome3.mutter: add optional deps
2014-01-21 14:11:20 +01:00
Domen Kožar
b4acb42a2c
gnome3.libgdata: remove unneeded dep
2014-01-21 14:11:20 +01:00
Domen Kožar
b4d1d88e42
enable gobjectintrospection for some libs
2014-01-21 14:11:20 +01:00
Domen Kožar
a3716328e6
Add mailpile: A modern, fast web-mail client with user-friendly encryption and privacy features
2014-01-21 14:11:19 +01:00
Domen Kožar
0c9f4cb22a
evolution-data-server: upgrade and move to gnome3 namespace
2014-01-21 14:11:19 +01:00
Domen Kožar
dbfaeaf0df
add gnome3.libgdata and liboauth
2014-01-21 14:11:19 +01:00
Sander van der Burg
28d51a31ee
Stick titanium CLI to version 3.2.0, otherwise the latest beta version gets installed
2014-01-21 12:10:53 +01:00
Eelco Dolstra
8ad41b92cf
nixUnstable: Update to 1.7pre3327_0e2ca26
...
Also fixes disappeared tarball.
2014-01-21 09:59:50 +01:00
Shea Levy
744e9fd81a
Don't include llvm self-built packages in nix-env -qa/nix-env -i
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-20 20:42:49 -05:00
Shea Levy
407c60fdf9
Fix tarball
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-20 20:33:06 -05:00
Shea Levy
fea2266290
llvm: Split llvmFull into separate derivations
...
Now most packages in the llvm suite are built as separate derivations.
The exceptions are:
* compiler-rt must currently be built with llvm. This increases llvm's
size by 6 MB
* clang-tools-extra must be built with clang
In addition, the top-level llvm attribute is defaulted to llvm 3.4, and
llvm 3.3 must be accessed by the llvm_33 attribute. This is to make the
out-of-date packages obvious in the hope that eventually all will be
updated to work with 3.4 and 3.3 can be removed. I think we should keep
this policy in the future (latest llvm gets top-level name, the rest are
versioned until they can be removed).
The llvm packages (except libc++, which exception I will try to remove
on the next update) can all be accessed via the llvmPackages attribute,
and there are also aliases for the packages that already existed (llvm,
clang, and dragonegg).
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-20 20:33:06 -05:00
Vladimír Čunát
204ec0cd43
stdenv/setup.sh: add .gz extension to links to .gz man pages
...
The links weren't broken since 0a44a09
, but man showed garbage.
Tested on several packages (sudo, dosfstools, xz).
2014-01-20 22:11:14 +01:00
Vladimír Čunát
ac6761c908
Merge master into stdenv-updates
...
Conflicts:
pkgs/applications/version-management/gource/default.nix
pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00