summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* hydra: 2016-04-15 -> 2016-11-24origin/hydraBumpDomen Kožar2016-11-292-10/+6
* nixUnstable: bump to 2016-11-28Domen Kožar2016-11-291-3/+3
* Merge pull request #19990 from domenkozar/buildtheworld•••Build all derivations on Linux, unless specified otherwiseDomen Kožar2016-11-291-1/+1
|\
| * Build all derivations at least for 64bit LinuxDomen Kožar2016-11-281-1/+1
* | Merge pull request #20781 from abuibrahim/master•••haskellPackages.barrier: jailbreakPeter Simons2016-11-291-0/+2
|\ \
| * | haskellPackages.barrier: jailbreakRuslan Babayev2016-11-281-0/+2
* | | Merge pull request #20779 from TikhonJelvis/hadoop-darwin•••hadoop-2.2.0: Added a check to not run patchelf on MacOS.Peter Simons2016-11-291-1/+2
|\ \ \
| * | | Added a check to not run patchelf on Darwin systems.Tikhon Jelvis2016-11-281-1/+2
* | | | (rustc-nightly) init at 2016-11-26 - precompiled rustc nightly binaryjoachim schiele2016-11-292-0/+61
* | | | Merge pull request #20778 from NeQuissimus/atom_1_12_6•••atom: 1.12.5 -> 1.12.6Frederik Rietdijk2016-11-291-2/+2
|\ \ \ \
| * | | | atom: 1.12.5 -> 1.12.6Tim Steinbach2016-11-281-2/+2
| |/ / /
* | | | Merge pull request #20785 from ericsagnes/pkg-update/groonga•••groonga: 6.1.0 -> 6.1.1Frederik Rietdijk2016-11-291-2/+2
|\ \ \ \
| * | | | groonga: 6.1.0 -> 6.1.1•••release notes: http://groonga.org/en/blog/2016/11/29/groonga-6.1.1.html Eric Sagnes2016-11-291-2/+2
| | |/ / | |/| |
* | | | Merge pull request #20784 from peterhoeg/u/puddletag•••puddletag: 1.1.1 -> 1.2.0Frederik Rietdijk2016-11-291-6/+7
|\ \ \ \ | |/ / / |/| | |
| * | | puddletag: 1.1.1 -> 1.2.0Peter Hoeg2016-11-291-6/+7
* | | | Merge pull request #20763 from lsix/update_nagios•••nagios: 4.0.8 -> 4.2.3 (for CVE)Graham Christensen2016-11-282-6/+6
|\ \ \ \
| * | | | nagiosPluginsOfficial: 2.0.3 -> 2.1.4•••See https://github.com/nagios-plugins/nagios-plugins/blob/master/NEWS for release history Lancelot SIX2016-11-281-2/+2
| * | | | nagios: 4.0.8 -> 4.2.3•••This update includes many security related fixes. Version 4.2.0 fixes: - CVE-2008-4796 - CVE-2013-4214 Version 4.2.2 fixes: - CVE-2016-9565 Version 4.2.3 fixes: - CVE-2016-8641 See https://www.nagios.org/projects/nagios-core/history/4x/ for full detail changes. Lancelot SIX2016-11-281-4/+4
* | | | | Merge pull request #20772 from nico202/yarp•••yarp: 2.3.66.1 -> 2.3.68Graham Christensen2016-11-281-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | yarp: 2.3.66.1 -> 2.3.68Nicolò Balzarotti2016-11-281-3/+3
| |/ / /
* | | | gitRepo: 1.22 -> 1.23Graham Christensen2016-11-281-2/+2
* | | | linuxPackages.ati_drivers_x11: patch for kernel 4.7+ (#19810)Matt McHenry2016-11-282-4/+77
* | | | lxc: 2.0.4 -> 2.0.6•••Fixes CVE-2016-8649. See https://lists.linuxcontainers.org/pipermail/lxc-users/2016-November/012597.html. Franz Pletz2016-11-281-0/+1
* | | | llvmPackages*.lldb: fixup input by disabling libedit•••Fixes #20773. https://llvm.org/bugs/show_bug.cgi?id=28898 Of course, feel free to find a better solution. I love this copy&paste :-/ Vladimír Čunát2016-11-286-0/+6
* | | | Merge pull request #20774 from aherrmann/pr_matplotlib_tkagg•••matplotlib: Fix "attribute ‘tkinter’ missing"Frederik Rietdijk2016-11-281-1/+1
|\ \ \ \
| * | | | matplotlib: Fix "attribute ‘tkinter’ missing"•••`tkinter` is not part of `python`, but of `pythonPackages`. Andreas Herrmann2016-11-281-1/+1
| | |_|/ | |/| |
* | | | aws-sdk-cpp: 0.10.6 -> 1.0.34Eelco Dolstra2016-11-281-15/+8
* | | | Merge pull request #19900 from michalpalka/xen-fix-xen-bridge2•••xen service: fix wrong netmask handed out by xen-bridge.serviceJoachim F2016-11-281-1/+1
|\ \ \ \
| * | | | xen service: fix wrong netmask handed out by xen-bridge.service•••The dnsmasq instance run by the xen-bridge.service errorenously hands out 172.16.0.0 as the netmask over DHCP to the VMs. This commit removes the option responsible for that from dnsmasq.conf, so that the proper netmask is inferred by dnsmasq instead. Addresses https://github.com/NixOS/nixpkgs/issues/19883 Michał Pałka2016-10-261-1/+1
* | | | | Merge pull request #19851 from michalpalka/xen-fix-xen-bridge•••xen service: fix iptables race condition in xen-bridge.serviceJoachim F2016-11-281-8/+8
|\ \ \ \ \
| * | | | | xen service: fix iptables race condition in xen-bridge.service•••The calls to iptables in xen-bridge.service were missing the -w switch, which caused them to fail if another script was calling iptables at the same time. Fix it by adding the -w switch. Addresses https://github.com/NixOS/nixpkgs/issues/19849 . Michał Pałka2016-10-251-8/+8
* | | | | | Merge pull request #20769 from aycanirican/master•••hydra-module: add cfg.package to hydra-evaluator pathDomen Kožar2016-11-281-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | hydra-module: add cfg.package to hydra-evaluator pathAycan iRiCAN2016-11-281-1/+1
* | | | | | Merge pull request #20766 from avnik/update/lxc•••lxc: 2.0.4 -> 2.0.6 (security)Peter Simons2016-11-281-2/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | lxc: 2.0.4 -> 2.0.6 (security)•••https://security-tracker.debian.org/tracker/CVE-2016-8649 Alexander V. Nikolaev2016-11-281-2/+2
| * | | | | lxc: fix sandbox builds•••Package attempt to write /etc/bash_completion.d, I directed it to "${out}/etc/bash_completion.d" as it was suggested. Alexander V. Nikolaev2016-11-281-0/+1
* | | | | | Merge pull request #20749 from gnidorah/master3•••genymotion: 2.7.2 -> 2.8.0 and add menu itemGraham Christensen2016-11-281-6/+14
|\ \ \ \ \ \
| * | | | | | genymotion: 2.7.2 -> 2.8.0Alex Ivanov2016-11-271-4/+4
| * | | | | | genymotion: add menu itemAlex Ivanov2016-11-271-2/+10
* | | | | | | Merge pull request #20768 from mdaiter/opencv_maintainer•••opencv3: adding myself as co-maintainerviric2016-11-281-1/+1
|\ \ \ \ \ \ \
| * | | | | | | opencv3: adding myself as co-maintainerMatthew Daiter2016-11-281-1/+1
* | | | | | | | rxvt_unicode: create .desktop fileTim Nieradzik2016-11-281-7/+19
|/ / / / / / /
* | | | | | | Merge pull request #20631 from mdaiter/opencv_upgrade•••opencv3: added CUDA 8.0 specific patchesviric2016-11-281-3/+14
|\ \ \ \ \ \ \
| * | | | | | | opencv3: added CUDA 8.0 specific patches•••opencv3: added informative comments Matthew Daiter2016-11-231-3/+14
* | | | | | | | bftpd: init at 4.4Michael Raskin2016-11-282-0/+26
* | | | | | | | Merge pull request #20689 from frontsideair/flow-34-36•••flow: 0.34.0 -> 0.36.0Graham Christensen2016-11-281-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | flow: 0.34.0 -> 0.36.0Fatih Altinok2016-11-241-2/+2
* | | | | | | | | Merge pull request #20676 from matthewbauer/file_cmds•••file_cmds: init at 264.1.1Graham Christensen2016-11-282-0/+35
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | file_cmds: init at 264.1.1Matthew Bauer2016-11-272-0/+35
* | | | | | | | | | lnav: fix compilation•••nix-env -i lnav currently result of a failure: command_executor.cc:34:21: fatal error: pcrecpp.h: No such file or directory This fixes by using pcre-cpp instead of pcre. Signed-off-by: Vincent Demeester <vincent@sbr.pm> Vincent Demeester2016-11-281-2/+2