mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-19 17:39:34 +00:00
Code Issues Wiki Activity
79869 commits 196 branches 125 tags 12 GiB
Commit graph

69186 commits

Author SHA1 Message Date
Vladimír Čunát e69306c463 xmlsec: fix linkage, probably after #909 
This fixes builds of (some) reverse dependencies, e.g. aqbanking.
 2016-03-29 12:22:54 +02:00
Frederik Rietdijk 572a723ee5 Merge pull request #14270 from Beauhurst/kombu_3_0_35 
Python kombu, billiard & celery updates
 2016-03-29 12:09:10 +02:00
Vladimír Čunát 5147b9d30a pythonPackages.poppler-qt4: fix build by a hack 
/cc maintainer @sepi.
 2016-03-29 11:56:52 +02:00
Peter Simons a1f7b231c4 Merge pull request #14279 from acowley/doxygen 
doxygen: fix on darwin
 2016-03-29 11:24:10 +02:00
Peter Simons 7237161bb0 Merge pull request #14287 from kragniz/git-2.8.0 
git: 2.7.4 -> 2.8.0
 2016-03-29 11:23:12 +02:00
Vladimír Čunát 117183e27e intltool: fix problems with perl-5.22 
http://hydra.nixos.org/build/33608086/nixlog/1/raw
 2016-03-29 11:12:42 +02:00
Vladimír Čunát 62c29908da dvdisaster: disable parallel building 
http://hydra.nixos.org/build/33609373/nixlog/1/raw
/cc @nkcx. I notified upstream.
 2016-03-29 10:53:36 +02:00
Arseniy Seroka 63c78c34ab Merge pull request #14288 from kragniz/opencpn 
opencpn: init at 4.2.0
 2016-03-29 10:15:48 +03:00
Louis Taylor b40f0ac3c7 opencpn: init at 4.2.0 2016-03-29 07:31:56 +01:00
Louis Taylor 69c6f7e20a git: 2.7.4 -> 2.8.0 2016-03-29 07:21:41 +01:00
Franz Pletz ebf21fd29e libressl_2_3: 2.3.2 -> 2.3.3 2016-03-29 04:55:14 +02:00
Nikolay Amiantov a6e0046b75 Merge pull request #14218 from abbradar/avidemux 
avidemux: 2.5.6 -> 2.6.12
 2016-03-29 04:48:51 +04:00
joachifm 0270ce193e Merge pull request #14281 from taku0/thunderbird-bin-38.7.1 
thunderbird-bin: 38.6.0 -> 38.7.1
 2016-03-29 00:33:35 +00:00
taku0 dc73280d19 thunderbird-bin: 38.6.0 -> 38.7.1 2016-03-29 09:19:34 +09:00
Nikolay Amiantov cef2db7e76 haskellPackages.mueval: fix build 2016-03-29 02:23:06 +03:00
Anthony Cowley 8db6998a0a doxygen: fix on darwin 
This avoids an issue where an old OS X SDK is assumed, leading to a
linker error of the form:

Undefined symbols: __Unwind_Resume
 2016-03-28 18:19:41 -04:00
Brian McKenna d47e2fde69 steam: enable hardware decoding (for In-Home Streaming) 
Previous to this patch I was getting software decoding when I used In-Home
Streaming. I had a look around and according to:

https://bbs.archlinux.org/viewtopic.php?id=187922

> It seems that the libva version Steam comes with, is not compatible anymore to
> the newer libva 1.4.0.

Substituting in our version of libva gives me hardware decoding!
 2016-03-29 09:17:15 +11:00
joachifm 7ddf8460a5 Merge pull request #14211 from LatitudeEngineering/latitude/topic/gazebo 
gazebo: init at 6.5.1 and 7.0.0
 2016-03-28 21:51:27 +00:00
Arseniy Seroka 915a02ccaf Merge pull request #14275 from nico202/meterbridge 
meterbridge: fix gcc-5 build (thanks to: http://ports.ubuntu.com/pool…
 2016-03-28 23:16:14 +03:00
joachifm 96a1e39e78 Merge pull request #14269 from taku0/oraclejdk-8u77 
oraclejdk: 8u73, 8u74 -> 8u77
 2016-03-28 19:24:17 +00:00
= c7a26ccf9d meterbridge: fix gcc-5 build (thanks to: http://ports.ubuntu.com/pool/universe/m/meterbridge/) 2016-03-28 20:50:47 +02:00
Patrick Callahan 66b5055b95 gazebo: init at 6.5.1 and 7.0.0 2016-03-28 11:44:37 -07:00
Patrick Callahan 565b7b34ed ignition.transport: init at 0.9.0 and 1.0.1 2016-03-28 11:44:37 -07:00
Patrick Callahan 3c95d6d1ea sdformat: init at 3.7.0 and 4.0.0 2016-03-28 11:44:37 -07:00
Patrick Callahan b682906b6a ignition robotics libs: init; .math: init at 2.3.0 2016-03-28 11:44:37 -07:00
Patrick Callahan 008bcf51a4 tinyxml-2: init at 3.0.0 2016-03-28 11:44:36 -07:00
Patrick Callahan 4316161495 ogre: 1.9.0 -> 1.9-hg 2016-03-28 11:10:48 -07:00
Frederik Rietdijk 9825a81cfc pythonPackages.numpy: 1.11 -> 1.10 
Reverting default numpy to 1.11, since 1.10 breaks pandas and required
patches couldn't be cherry-picked.

1.11 is still available as `pythonPackages.numpy_1_11`.
 2016-03-28 19:06:48 +02:00
Joachim Fasting 8bd72dfaa4 lsh: fix gcc5 build 
The build fails with c11 (also tested c99), but works with gnu90.
 2016-03-28 19:01:58 +02:00
Shea Levy 57d5860bd5 Merge branch 'bower2nix' 2016-03-28 12:59:49 -04:00
joachifm 8222b610cd Merge pull request #14273 from bradediger/spotify 
spotify: 1.0.25.127 -> 1.0.26.125
 2016-03-28 16:26:56 +00:00
joachifm 3d9d2f15b3 Merge pull request #14255 from risicle/osrm_fixes 
osrm-backend: 4.5.0 -> 4.9.1
 2016-03-28 16:15:16 +00:00
joachifm 55423a1be6 Merge pull request #14272 from joachifm/fix-v8 
v8: fix build(s)
 2016-03-28 16:02:53 +00:00
joachifm 58ef31f18a Merge pull request #14263 from risicle/osrm_remove_luajit 
osrm-backend: remove osrm-backend_luajit variant - it has been broken for a while
 2016-03-28 15:59:01 +00:00
joachifm 02108fe91c Merge pull request #14271 from Beauhurst/django_reversion_1_10_1 
django_reversion: 1.8.5 -> 1.10.1
 2016-03-28 15:57:33 +00:00
joachifm aa2ebd4b11 Merge pull request #14215 from Beauhurst/django_remove_mo 
django packaging: remove remaining uses of makeOverridable for django-depending packages
 2016-03-28 15:56:55 +00:00
Brad Ediger 066042e3fa spotify: 1.0.25.127 -> 1.0.26.125 2016-03-28 10:56:17 -05:00
joachifm a66a64cedc Merge pull request #14182 from NeQuissimus/pppscripts 
ppp: Include convenience scripts
 2016-03-28 15:19:44 +00:00
Joachim Fasting 72b5bfda97 v8: fix build(s) 
Ignore errors due to strict-overflow warnings; strip clang-only flag on
non-clang builds. Concerning the latter "fix", it's not entirely clear to me why
the -Wno-format-pedantic flag ends up being passed to gcc, the .gyp file appears
to already condition the inclusion of this flag on whether cc=clang.
 2016-03-28 17:13:40 +02:00
Robert Scott 46d26e82f4 django_reversion: 1.8.5 -> 1.10.1 2016-03-28 14:55:22 +00:00
Domen Kožar c61445357e Merge pull request #14239 from kragniz/linux-testing-4.6-rc1 
Linux-testing 4.6-rc1
 2016-03-28 15:53:52 +01:00
Robert Scott a01b9f7c74 celery: 3.1.19 -> 3.1.23 2016-03-28 14:29:16 +00:00
Robert Scott e6026003df billiard: 3.3.0.21 -> 3.3.0.23 2016-03-28 14:29:16 +00:00
Robert Scott 364b3d2453 kombu: tidy up, removing py3k fussiness which is handled by the deps and adding to buildInputs to allow more of the test suite to run 2016-03-28 14:28:50 +00:00
taku0 b8cc111764 oraclejdk: 8u73, 8u74 -> 8u77 2016-03-28 23:14:33 +09:00
Frederik Rietdijk 654d2e672d pythonPackages.numpy: 1.10 -> 1.11 2016-03-28 16:11:30 +02:00
Frederik Rietdijk 9ee7b3f628 pythonPackages.scipy: use latest numpy version 2016-03-28 16:04:51 +02:00
Frederik Rietdijk c1abb1d404 openblas: 0.2.15 -> 0.2.17 2016-03-28 15:58:10 +02:00
Robert Scott 86435a1b41 kombu: 3.0.33 -> 3.0.35, add redis to buildInputs to allow tests to pass 2016-03-28 13:39:38 +00:00
Frederik Rietdijk 7ab852d7b8 Merge pull request #12538 from FRidh/yakuake 
kde5.yakuake: init at 3.0.2
 2016-03-28 14:55:41 +02:00
Frederik Rietdijk c39fe33998 kde5.yakuake: init at 3.0.2 2016-03-28 14:52:20 +02:00
Vladimír Čunát be447475d3 clang-3.5: mark as broken 
It seems unlikely someone will want to fix it anymore.
 2016-03-28 14:42:50 +02:00
Frederik Rietdijk 4c13595507 Merge pull request #14093 from matthiasbeyer/add-be 
bugseverywhere: init at 1.1.1
 2016-03-28 14:39:38 +02:00
Vladimír Čunát ed47bb1ca8 qt55.vlc: fix build 
I tested it on a video to make sure the bug doesn't appear.
 2016-03-28 14:37:25 +02:00
Matthias Beyer 729c069108 bugseverywhere: init at 1.1.1 2016-03-28 14:35:47 +02:00
Frederik Rietdijk 2636fcf7cd fix license 2016-03-28 14:24:06 +02:00
Frederik Rietdijk 2b10296637 Merge pull request #13858 from leenaars/blinkqt 
python-sipsimple: 2.6.0 -> 3.0.0 (with all dependencies)
 2016-03-28 14:18:33 +02:00
Frederik Rietdijk c603ae5992 Merge pull request #14194 from ericsagnes/pkg-update/python/docker-compose 
docker-compose: 1.5.2 -> 1.6.2
 2016-03-28 14:03:47 +02:00
Vladimír Čunát f4cb39c3d3 mesa: maintenance update 11.1.1 -> 11.1.2 2016-03-28 14:02:36 +02:00
Andrew Kelley f5fe051c71 llvm: 3.7.1 -> 3.8.0 (close #13801) 
vcunat's review:
 - let's not switch the default versions of llvm* for now
 - the only changes I see is adding python to clang's buildInputs
   and using the big so-file as discussed in #12759
   (BUILD_SHARED_LIBS -> LLVM_LINK_LLVM_DYLIB)
 - in future it will be nice to split libLLVM into a separate output
 2016-03-28 13:37:31 +02:00
Frederik Rietdijk 58a65c013d python.bootstrapped-pip: 8.0.2 -> 8.1.1 2016-03-28 13:35:46 +02:00
Frederik Rietdijk 7391011354 pythonPackages.pip: 8.0.2 -> 8.1.1 2016-03-28 13:35:20 +02:00
Thomas Tuegel 350d196f7a kwin: allow CMake to set RPATH during build 
(cherry picked from commit 3ff6d0492a)
 2016-03-28 06:23:43 -05:00
Robert Scott 01f96aa572 osrm-backend: remove osrm-backend_luajit variant - it has been broken for a while 2016-03-28 10:45:16 +00:00
aszlig f9fff51c2a
chromium: Link using gold linker flags 
I originally wanted to do this a long time (a31301d) but IIRC back then
it didn't compile. Nowadays with the splitup of the gold linking flags
and the binutils integration, it's merely just a switch to flip, so
let's do that.

Only tested it by building against the current Chromium stable version
on 64bit, because right now builds on Hydra seem to time out (because of
this?) anyway so we have nothing to lose here.

The linking time was hereby reduced from >30 minutes (I didn't measure
it exactly but looked half an hour later to the build progress and it
was *still* linking) to about a few seconds, which I guess is even
though the measurement is quite bogus a tremendous improvement
nonetheless.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-03-28 11:41:13 +02:00
Domen Kožar d0aadb0c91 Merge pull request #14257 from grahamc/failingtests 
ikiwiki: Fix failing dependency builds
 2016-03-28 10:39:19 +01:00
Vladimír Čunát a7d34e0c13 glu: fix the pkg-config file (fixes #14260) 2016-03-28 11:33:48 +02:00
Domen Kožar b4e2172ad4 fix munin (and the test), refs #12801 #13999 
(cherry picked from commit 7877e33af8)
Signed-off-by: Domen Kožar <domen@dev.si>
 2016-03-28 10:26:35 +01:00
Rodney Lorrimar b22e94c200 Add pkgs.buildBowerComponents function 2016-03-28 08:25:44 +01:00
Rodney Lorrimar 457eddd18f bower2nix: 2.1.0 -> 3.0.1 
1. Update bower2nix version and add new/updated dependencies into
   node-packages-generated.nix. This was done manually, with npm2nix
   generating the initial set of derivations. In future, it would be
   nice to have an automatic process (see #10358, #9332).

2. Add an override to nodePackages.bower2nix wrapping the commands so
   that git is on the PATH.

3. Update fetchbower to support new command-line options of bower2nix,
   and to allow github URL tag versions.
 2016-03-28 08:23:06 +01:00
Rodney Lorrimar 156b05ae48 nodePackages.typescript: 1.5.0-alpha -> 1.8.9 2016-03-28 08:14:52 +01:00
Rodney Lorrimar 5ca8c23b2a nodePackages.bower: 1.4.1 -> 1.7.7 2016-03-28 08:14:52 +01:00
Vladimír Čunát 8ffe681713 qt4-clang: fix fallout from f9b5ed66d1 
There's still the question of Hydra binaries etc. but this should at
least fix evaluation and running problems.
 2016-03-28 09:05:12 +02:00
Vladimír Čunát eb4a9d4d9c Revert "texlive.combine: patch paths into texmf.cnf" 
This reverts commit acf664814e.
Let's revert until we catch the bugs in this.
 2016-03-28 08:51:39 +02:00
joachifm 4989fd85d4 Merge pull request #14210 from LatitudeEngineering/latitude/topic/genromfs 
genromfs: init at 0.5.2
 2016-03-28 03:41:38 +00:00
Graham Christensen 125ee11a35 perlPackage.RTClientREST: Depend on CGI 2016-03-27 21:08:31 -05:00
Graham Christensen c3d6b5e8f2 I18NLangTags: Removed, as this version is 12 years old and is now bundled with core. 2016-03-27 21:00:45 -05:00
Graham Christensen 36b88f8df7 perlPackages.DateTimeFormatDateParse: Depend on ModuleBuild 2016-03-27 20:36:53 -05:00
Graham Christensen 200ddaa54f perlPackages.DataSerializer: Depend on ModuleBuild 2016-03-27 20:35:22 -05:00
Graham Christensen ce5914c898 perlPackages.ScalarString: Depend on ModuleBuild 2016-03-27 20:13:51 -05:00
Graham Christensen aa73eadc1c perlPackages.ParamsClassify: Depend on ModuleBuild 2016-03-27 20:13:27 -05:00
Graham Christensen 849e743040 perlPackages.NetOpenIDConsumer: Depend on CGI 2016-03-27 20:12:49 -05:00
Graham Christensen df9a6362ea perlPackages.HTTPLite: Depend on ModuleBuild 2016-03-27 20:12:16 -05:00
Graham Christensen 2a44c63c43 perlPackages.HTMLTemplate: Depend on CGI 2016-03-27 20:11:56 -05:00
Graham Christensen 9fc9ede52d perlPackages.DataFloat: Depend on ModuleBuild 2016-03-27 20:11:25 -05:00
Graham Christensen 4532a2a75d perlPackages.DataEntropy: Depend on ModuleBuild 2016-03-27 20:11:00 -05:00
Graham Christensen 5dd946ded9 perlPackages.CryptEksblowfish: Depend on ModuleBuild 2016-03-27 20:10:31 -05:00
Graham Christensen 189d29e5f6 perlPackages.ClassMix: Depend on CGI 2016-03-27 20:10:09 -05:00
Graham Christensen 692547202d perlPackages.CGISession: Depend on CGI 2016-03-27 20:09:49 -05:00
Graham Christensen 37131c116c perlPackages.CGIFormBuilder: Depend on CGI 2016-03-27 20:09:26 -05:00
Graham Christensen fb7ebfb8a6 perlPackages.AuthenPassphrase: Depend on ModuleBuild 2016-03-27 20:09:00 -05:00
Graham Christensen 2d182a2992 perlPackages.AuthenDecHpwd: Depend on ModuleBuild 2016-03-27 20:08:23 -05:00
Graham Christensen f11fd4a476 perlPackages.DataInteger: depend on ModuleBuild 2016-03-27 19:25:31 -05:00
Tobias Geerinckx-Rice d5207802fa mcelog: 134 -> 135 2016-03-28 01:27:56 +02:00
Michael Raskin 0d18980bf5 perl-Net-SMTP-SSL: update 2016-03-28 01:18:32 +02:00
Michael Raskin 1a97cfb91f lilypond: set some HOME during the build for Metafont 2016-03-28 01:00:27 +02:00
Michael Raskin af3ec2046a perl-Alien-Wx: pass ModuleBuild dependency 2016-03-28 00:55:10 +02:00
Michael Raskin 891fa19e29 Fix Midori build 2016-03-28 00:02:10 +02:00
Eelco Dolstra f9b5ed66d1 Inline qt4-clang 
This prevents a potential name/version conflict in nix-env, and a
large Hydra build for a proprietary package.
 2016-03-27 23:32:15 +02:00
Eelco Dolstra 38afa836b3 openvpn: 2.3.8 -> 2.3.10 
In particular, this fixes the systemd-ask-password regression
re-introduced by cb1c818491.
 2016-03-27 23:29:53 +02:00
Domen Kožar 0d73970db6 xen: use gcc49 
(cherry picked from commit 0e41e8bbf0)
Signed-off-by: Domen Kožar <domen@dev.si>
 2016-03-27 21:45:21 +01:00
Thomas Tuegel 4d7e3be8bb calamares: mark broken 
(cherry picked from commit b8db5897c7)
Signed-off-by: Domen Kožar <domen@dev.si>
 2016-03-27 21:44:21 +01:00
Thomas Tuegel 0e5b441133 kde5.l10n.sr: patch shebangs 
(cherry picked from commit cb9f989b18)
Signed-off-by: Domen Kožar <domen@dev.si>
 2016-03-27 21:44:08 +01:00
Thomas Tuegel 6bcee1d9b2 kde5.l10n.nl: re-enable 
(cherry picked from commit e81ee2be29)
Signed-off-by: Domen Kožar <domen@dev.si>
 2016-03-27 21:44:03 +01:00
Domen Kožar 3027abe927 libgda: 5.2.2 -> 5.2.4 (fix build) 
(cherry picked from commit efc7b847e3)
Signed-off-by: Domen Kožar <domen@dev.si>
 2016-03-27 21:42:56 +01:00
Domen Kožar f8540e36ed fix perl modules for i3 
(cherry picked from commit ca6ac920ed)
Signed-off-by: Domen Kožar <domen@dev.si>
 2016-03-27 21:37:20 +01:00
Robert Scott 0b96e0daf3 osrm-backend: 4.5.0 -> 4.9.1 2016-03-27 20:28:45 +00:00
Domen Kožar d7034e6d5f nixUnstable: bump 
(cherry picked from commit bb6d3c16d3)
Signed-off-by: Domen Kožar <domen@dev.si>
 2016-03-27 20:24:43 +01:00
Domen Kožar 05cc16e35e perlPackages.TestMockModule: fix build 
(cherry picked from commit 7bd9321c6d)
Signed-off-by: Domen Kožar <domen@dev.si>
 2016-03-27 20:24:38 +01:00
Domen Kožar 9c4d3ba841 Merge pull request #14252 from joachifm/lttng-broken 
lttng-modules: mark as broken on kernel version <3.18
 2016-03-27 20:24:16 +01:00
Domen Kožar eacf9ba34e Merge pull request #14253 from joachifm/grsec-3-14-broken 
linux_grsec_3_14: mark as broken
 2016-03-27 20:24:08 +01:00
Domen Kožar e4c33a688d Merge pull request #14246 from abbradar/skype-workaround 
skype: use clang-built qt4 to fix segfault
 2016-03-27 20:21:29 +01:00
Domen Kožar c0b5735767 Merge pull request #14250 from NixOS/get-rid-of-md5-in-python-packages 
python-packages: Replace md5 by sha256 hashsums
 2016-03-27 20:21:03 +01:00
Nikolay Amiantov acf664814e texlive.combine: patch paths into texmf.cnf 
...instead of environment variables. Close #12768.
 2016-03-27 21:20:11 +02:00
Joachim Fasting dd16dcbba4 linux_grsec_3_14: mark as broken 
First, The patch is outdated, I failed to find it anywhere in the mirror repos.
Second, the build fails, and while it may be "fixed" by ad-hoc patching (it
appears to simply need some missing includes), this would mean shipping a
potentially insecure software package. Given that the only reason to use
grsecurity is security, this is both misleading and exposes users to undue risk.
Finally, the build has been broken for quite a long time with no complaints,
leading me to believe that the number of actual users is quite low.
 2016-03-27 21:13:41 +02:00
Arseniy Seroka a98eefd051 Merge pull request #14249 from romildo/fix.awesome 
awesome: include manual pages
 2016-03-27 21:47:49 +03:00
Nikolay Amiantov 5e985c42d6 cutegram: fix playing media files 2016-03-27 21:36:39 +03:00
Joachim Fasting a452b43ee5 lttng-modules: mark as broken on kernel version <3.18 
On linux 3.14, we get errors like
  error: 'struct snd_soc_codec' has no member named 'name'
     __string( name,  codec->CODEC_NAME_FIELD )
indicating that the module is incompatible with the linux API
in this kernel version.

See https://hydra.nixos.org/build/33102405/nixlog/1/raw
 2016-03-27 20:13:21 +02:00
Nikolay Amiantov 7b82f5a3fb pgadmin: enable parallel building 2016-03-27 20:56:27 +03:00
Nikolay Amiantov 4e9ddd3770 Revert "codeblocks: fix build" 
This reverts commit fd9416fb4b.

This shouldn't be needed now that we properly link wxGTK.
 2016-03-27 20:54:35 +03:00
Nikolay Amiantov 5471eed63c wxgtk: explicitly link to libX11 and libcairo 2016-03-27 20:53:55 +03:00
Nikolay Amiantov 539f1f3659 dwarf-fortress-packages: recurse into attrs (to build free packages) 2016-03-27 19:35:32 +03:00
Nikolay Amiantov d95dfd06ee octoprint-plugins.m3d-fio: 0.29 -> 0.30.2 2016-03-27 19:23:01 +03:00
Christoph Hrdinka a7e280b0f4 Merge pull request #14233 from matthiasbeyer/add-buku 
buku: init at 1.8
 2016-03-27 18:03:38 +02:00
Nikolay Amiantov 78b75b8ecd cutegram: fix meta information and parallel building 2016-03-27 18:53:54 +03:00
Pascal Wittmann f7d17e1130 python-packages: Replace md5 by sha256 hashsums 2016-03-27 17:17:46 +02:00
José Romildo Malaquias e39f9a2c11 awesome: include manual pages 2016-03-27 12:14:46 -03:00
Pascal Wittmann 3a0533b38a Merge pull request #14247 from zimbatm/direnv-2.8.0 
direnv: 2.7.0 -> 2.8.0
 2016-03-27 16:47:26 +02:00
zimbatm ea7068f44c direnv: 2.7.0 -> 2.8.0 2016-03-27 15:37:07 +01:00
Domen Kožar 4a42548388 cmis: fix build with gcc5 2016-03-27 15:11:13 +02:00
Nikolay Amiantov 28af80fcc0 skype: use clang-built qt4 to fix segfault 2016-03-27 15:48:06 +03:00
Matthias Beyer 45604fc46b buku: init at 1.8 2016-03-27 14:39:39 +02:00
Robert Helgesson 1b30674165 eclipse-plugin-testng: 6.9.10 -> 6.9.11 2016-03-27 14:37:05 +02:00
Domen Kožar b1a8ae2a35 ffmpeg: fix bad merge 2016-03-27 13:31:04 +01:00
Vladimír Čunát e3da83297f texlive: document in nixpkgs manual 
Fixes #13240. It's not really better than source-code comments it replaced,
but it's in a better accessible place.
 2016-03-27 14:29:18 +02:00
Domen Kožar b07e7bfc7b Merge remote-tracking branch 'origin/staging' 2016-03-27 13:19:04 +01:00
Arseniy Seroka d88ae1045d Merge pull request #14240 from kevincox/etcd-2.3.0 
etcd: 2.1.2 -> 2.3.0
 2016-03-27 14:17:58 +03:00
Arseniy Seroka 29ed01213f Merge pull request #14177 from peterhoeg/togglesg 
toggle.sg-download: init at 2016-02-08
 2016-03-27 14:16:19 +03:00
Nikolay Amiantov 3819384395 skype: small cleanup 2016-03-27 11:57:46 +03:00
joachifm 235a0d5bdc Merge pull request #14241 from joachifm/chromiumos 
linux_chromiumos: require 64bit build host
 2016-03-27 08:25:35 +00:00
joachifm 23f7e3ac63 Merge pull request #14235 from joachifm/openafsClient 
Openafs client
 2016-03-27 08:24:49 +00:00
Peter Hoeg 6911785c03 togglesg-download: init at 2016-02-08 2016-03-27 15:08:23 +08:00
Joachim Fasting bd9737cc3e linux_chromiumos: require 64bit build host 
I noticed that almost all the Hydra build failures were on i686. Sure
enough, upstream says that you need an x86_64 machine to build the
kernel.
 2016-03-27 05:35:04 +02:00
Kevin Cox 26bd115c9c etcd: 2.1.2 -> 2.3.0 2016-03-26 22:47:15 -04:00
Louis Taylor 8b7e150bb9 linux-testing: 4.5-rc7 -> 4.6-rc1 2016-03-27 03:10:19 +01:00
Louis Taylor 695c2e4ee4 kernel-config: do not use NFSD_PNFS on >=4.6 2016-03-27 03:09:30 +01:00
Joachim Fasting fd9416fb4b codeblocks: fix build 
https://hydra.nixos.org/build/33633573/nixlog/1/raw
 2016-03-27 03:49:42 +02:00
Eric Sagnes e3f00861df docker-compose: 1.5.2 -> 1.6.2 2016-03-27 10:25:42 +09:00
Eric Sagnes bdbdb03a16 docker-py: 1.5.0 -> 1.7.2 2016-03-27 10:16:37 +09:00
Eric Sagnes c867346b05 dockerpty: 0.3.4 -> 0.4.1 2016-03-27 10:16:37 +09:00