nixpkgs/pkgs/os-specific/linux
Domen Kožar d199d5041a ena: mark as broken on chromiumos
(cherry picked from commit bc06f19efb9a13a2b3fafbdc2ce35427e64c9402)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-21 12:04:17 +02:00
..
915resolution treewide: Add lots of platforms to packages with no meta 2016-08-02 21:17:44 +03:00
acpi
acpi-call Use general hardening flag toggle lists 2016-03-05 18:55:26 +01:00
acpid acpid: 2.0.25 -> 2.0.27; maintain 2016-04-30 14:15:33 +02:00
acpitool treewide: Add lots of meta.platforms 2016-08-02 21:42:43 +03:00
afuse
alienfx
alsa-firmware treewide: Add lots of meta.platforms 2016-08-02 21:42:43 +03:00
alsa-lib treewide: Shuffle outputs 2016-08-29 14:49:51 +03:00
alsa-oss
alsa-plugins alsa : 1.0.9 -> 1.1.0 2016-02-13 19:04:41 +00:00
alsa-tools treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
alsa-utils alsa : 1.0.9 -> 1.1.0 2016-02-13 19:04:41 +00:00
android-udev-rules android-udev-rules: usage example 2016-08-29 23:40:13 +02:00
apparmor libapparmor: Move python stuff to a separate output 2016-09-01 18:57:43 +02:00
ati-drivers Merge #18237: ati_drivers_x11: patch for kernel 4.6 2016-09-17 01:29:27 +02:00
atop atop: update 2.1-1 -> 2.2-3 2015-07-05 00:32:53 +03:00
audit audit: Move z/OS plugin to a separate output 2016-09-05 14:53:27 +02:00
autofs autofs5: 5.1.1 -> 5.1.2 2016-08-14 22:39:18 +03:00
batman-adv batman-adv: 2016.2 -> 2016.3 2016-09-06 03:59:43 +02:00
bbswitch Use general hardening flag toggle lists 2016-03-05 18:55:26 +01:00
bcc bcc: install documentation not as an executable 2016-09-08 20:39:24 +02:00
blcr Use general hardening flag toggle lists 2016-03-05 18:55:26 +01:00
blktrace treewide: Add lots of meta.platforms 2016-08-02 21:42:43 +03:00
bluez treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
bridge-utils
broadcom-sta broadcom-sta: don't (claim to) maintain anymore 2016-09-10 10:57:48 +02:00
btfs btfs: 2.10 -> 2.11 (#17737) 2016-08-14 21:14:20 +00:00
busybox busybox: fix static build 2016-09-09 04:46:00 +02:00
can-utils can-utils: updated homepage url (close #9425) 2015-08-24 18:55:55 +02:00
cgmanager Captialize meta.description of all packages 2016-06-20 13:55:52 +02:00
checkpolicy selinux: Use fstack-protector=all 2015-07-31 17:11:11 -07:00
checksec Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
cifs-utils cifs_utils: 6.4 -> 6.5; maintain 2016-05-25 02:06:47 +02:00
conky conky: 1.10.1 -> 1.10.3 2016-07-11 23:20:25 +00:00
conntrack-tools conntrack_tools: 1.4.2 -> 1.4.3; maintain 2015-09-10 23:01:30 +02:00
consoletools consoletools: copy utils to bin 2016-04-29 11:12:34 +08:00
conspy conspy: 1.13 -> 1.14 2016-04-13 14:47:04 +02:00
cpufrequtils glibc: Drop hurd support 2016-02-18 21:11:15 +01:00
cpupower cpupower: correct meta.homepage 2016-05-09 02:57:07 +02:00
cramfsswap treewide: Add lots of platforms to packages with no meta 2016-08-02 21:17:44 +03:00
crda Add version attribute where maintainers |= nckx 2016-01-25 17:35:21 +01:00
criu criu: fix merge fail 2016-08-02 17:52:51 +02:00
cryopid
cryptodev linuxPackages.cryptodev: 1.6 -> 1.8, disable pic hardening 2016-08-13 16:24:38 +02:00
cryptsetup cryptsetup: update project homepage 2016-07-03 21:43:52 +02:00
directvnc directvnc: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
disk-indicator Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
displaylink linuxPackages.displaylink: init at 1.1.62 2016-09-13 00:30:35 +03:00
dmidecode dmidecode: 2.12 -> 3.0 2015-09-13 15:55:49 -07:00
dmraid Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
dmtcp
dpdk dpdk: 16.04 -> 16.07, fix build against linux 4.7 (#18256) 2016-09-03 17:40:27 +02:00
drbd Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
dstat dstat: 0.7.2 -> 0.7.3 2016-06-20 18:08:31 +02:00
e1000e linuxPackages.e1000e: disable pic hardening 2016-08-13 16:25:29 +02:00
ebtables
edac-utils Fixed some descriptions 2015-06-29 16:20:58 +02:00
ena ena: mark as broken on chromiumos 2016-09-21 12:04:17 +02:00
eudev eudev: 3.1.5 -> 3.2 2016-08-11 17:57:35 +02:00
eventstat eventstat: 0.02.02 -> 0.03.02 2016-07-15 00:06:39 +08:00
facetimehd Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
fanctl fanctl: 0.9.0 -> 0.12.0 2016-09-17 22:37:39 -04:00
fatrace fatrace: 0.11 -> 0.12 2016-04-28 14:20:18 +02:00
fbterm
ffado Remove top-level dbus_python and pythonDBus. 2016-08-16 22:52:37 +02:00
firejail firejail: 0.9.42-rc1 -> 0.9.42 2016-09-12 13:01:34 +02:00
firmware Merge pull request #18073 from joachifm/rtl8723bs 2016-09-01 14:48:51 +02:00
flashbench
fnotifystat fnotifystat: init at 0.01.14 2016-07-15 00:44:41 +08:00
forkstat forkstat: 0.01.13 -> 0.01.14 (#18076) 2016-08-29 01:38:01 +00:00
forktty
frandom linuxPackages.frandom: disable pic hardening 2016-08-13 16:03:32 +02:00
freefall freefall: inherit kernel package from linuxPackages 2016-03-16 21:10:20 +01:00
fswebcam Captialize meta.description of all packages 2016-06-20 13:55:52 +02:00
ftop Add version attribute where maintainers |= nckx 2016-01-25 17:35:21 +01:00
fuse fuse: 2.9.5 -> 2.9.7 2016-09-16 22:28:14 +02:00
fusionio linuxPackages.fusionio-vsl: disable pic hardening (still broken) 2016-08-13 16:55:26 +02:00
fxload treewide: Add lots of meta.platforms 2016-08-02 21:42:43 +03:00
gfxtablet gfxtablet: git-2013-10-21 -> 1.4 2016-07-19 20:47:00 +02:00
gogoclient Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
google-authenticator treewide: Add lots of meta.platforms 2016-08-02 21:42:43 +03:00
gradm gradm: 3.1-201607172312 -> 3.1-201608131257 2016-08-17 15:19:33 +02:00
guvcview guvcview: 2.0.2 -> 2.0.4 2016-06-26 13:44:24 +08:00
hal-flash Use common licence attributes from lib/licenses.nix 2015-05-27 22:00:06 +02:00
hd-idle fix eval 2016-08-16 22:30:15 +02:00
hdapsd New hdapsd module 2016-02-24 21:51:13 +01:00
hdparm hdparm: 9.45 -> 9.48 2015-07-09 17:30:35 -07:00
hibernate treewide: Add lots of meta.platforms 2016-08-02 21:42:43 +03:00
hostapd hostapd: add patch to fix build with libressl 2016-07-29 12:03:08 +02:00
hwdata hwdata: 0.276 -> 0.291 2016-08-13 10:06:34 +08:00
i2c-tools i2c-tools: Fetch source from debian 2016-01-03 19:34:37 +02:00
i7z treewide: Add lots of meta.platforms 2016-08-02 21:42:43 +03:00
i810switch treewide: Add lots of meta.platforms 2016-08-02 21:42:43 +03:00
ifenslave Use general hardening flag toggle lists 2016-03-05 18:55:26 +01:00
ima-evm-utils Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
iomelt Disable bunch of non-compiling packages on Darwin 2016-09-01 20:39:33 +03:00
iotop buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
iproute iproute2: 4.3.0 -> 4.5.0 (#15193) 2016-05-06 03:09:47 +02:00
ipsec-tools Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
ipset ipset: 6.26 -> 6.27 2015-11-07 16:28:14 -08:00
iptables Revert "iptables: add 1.6 branch (init 1.6.0). Not making it the default this time." 2016-05-03 20:29:52 +02:00
iputils iputils: 20121221 -> 20151218 2016-08-10 07:12:08 +02:00
irqbalance irqbalance: init at 1.1.0 2016-01-08 12:37:43 +01:00
iw iw: 4.1 -> 4.3 2016-05-03 16:15:20 +02:00
ixgbevf linuxPackages.ixgbevf: disable pic hardening 2016-08-13 16:30:35 +02:00
jfbview jfbview: update mupdf 1.8 -> 1.9 2016-06-12 09:48:34 -07:00
jool Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
jujuutils treewide: Add lots of meta.platforms 2016-08-02 21:42:43 +03:00
kbd kbd: split keymaps into kbdKeymaps 2016-07-08 12:52:39 +03:00
kbdlight Add kbdlight package and setuid wrapper 2015-05-11 13:23:01 +08:00
kernel kernelPatches: remove legacy grsecurity attrs 2016-09-18 15:26:57 +02:00
kernel-headers Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
kexectools Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
keyutils
klibc Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
kmod kmod: 22 -> 23, add /lib/modules to module directories 2016-08-19 17:57:08 +03:00
kmod-blacklist-ubuntu treewide: Add lots of meta.platforms 2016-08-02 21:42:43 +03:00
kmod-debian-aliases treewide: Add lots of meta.platforms 2016-08-02 21:42:43 +03:00
kmscon kmscon: Fix build against systemd 230 2016-05-26 21:05:55 +02:00
latencytop treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
ldm Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
libaio libaio.i686: disable stackprotector hardening 2016-03-29 00:34:20 +00:00
libatasmart
libcap treewide: Shuffle outputs 2016-08-29 14:49:51 +03:00
libcap-ng libcap-ng: 0.7.3 -> 0.7.7 2015-09-23 20:49:19 -07:00
libcgroup nixpkgs: libcgroup adopt, bump 0.38 -> 0.41 2015-04-11 15:22:52 -05:00
libnl treewide: Shuffle outputs 2016-08-29 14:49:51 +03:00
libnscd treewide: Add lots of platforms to packages with no meta 2016-08-02 21:17:44 +03:00
libselinux libselinux: fix Python binding 2016-08-19 19:06:25 +03:00
libsemanage selinux: Use fstack-protector=all 2015-07-31 17:11:11 -07:00
libsepol selinux: Use fstack-protector=all 2015-07-31 17:11:11 -07:00
libsmbios Captialize meta.description of all packages 2016-06-20 13:55:52 +02:00
libvolume_id treewide: Add lots of platforms to packages with no meta 2016-08-02 21:17:44 +03:00
light
lightum lightum: fix build against systemd-230 2016-07-16 21:57:23 +08:00
lm-sensors treewide: Add lots of meta.platforms 2016-08-02 21:42:43 +03:00
lockdep Captialize meta.description of all packages 2016-06-20 13:55:52 +02:00
lsb-release lsb-release: init at 1.4 2016-04-22 14:03:27 -03:00
lsiutil
lsscsi treewide: Add lots of platforms to packages with no meta 2016-08-02 21:17:44 +03:00
lttng-modules lttng-modules: broken on chromiumos 2016-09-16 11:12:29 +02:00
lvm2 Adding libuuid (libblkid) to lvm2. 2016-05-06 15:09:49 +02:00
lxc lxc: 2.0.3 -> 2.0.4 2016-08-26 13:43:35 +02:00
macchanger macchanger: move build deps to nativeBuildInputs 2016-03-12 18:53:27 +01:00
mba6x_bl linuxPackages.mba6x_bl: 2016-02-12 -> 2016-04-22 2016-09-10 20:27:49 +03:00
mbpfan mbpfan: include buffer overflow patch 2016-08-31 19:25:28 +08:00
mcelog mcelog: add utillinux as dependency 2016-09-06 20:30:47 +02:00
mdadm treewide: Add lots of meta.platforms 2016-08-02 21:42:43 +03:00
microcode microcode-intel: 20150121 -> 20160714 2016-08-13 03:53:03 +08:00
mingetty
miraclecast Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06"" 2015-11-14 12:32:51 -08:00
mkinitcpio-nfs-utils mkinitcpio-nfs-utils: init at 0.3 2015-10-18 18:37:52 +03:00
mmc-utils Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
mstpd
multipath-tools multipath-tools: 0.5.0 -> 0.6.2, fixes build 2016-09-09 23:14:16 +02:00
musl musl: disable stackprotector hardening 2016-08-29 13:04:29 +01:00
mxu11x0 linuxPackages.mxu11x0: disable pic hardening 2016-03-29 10:22:14 +00:00
ndiswrapper linuxPackages.ndiswrapper: disable pic hardening (still broken) 2016-08-13 16:50:43 +02:00
net-tools update net-tools home page 2015-11-18 00:35:28 -05:00
netatop Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
nfs-utils Merge recent 'staging' into closure-size 2016-02-03 16:57:19 +01:00
nftables nftables: 0.5 -> 0.6 2016-09-01 12:25:14 +02:00
nss_ldap treewide: Add lots of platforms to packages with no meta 2016-08-02 21:17:44 +03:00
numactl Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-17 21:30:43 +01:00
numad Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
nvidia-x11 treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
nvidiabl linuxPackages.nvidiabl: disable pic hardening 2016-08-13 16:44:39 +02:00
odp-dpdk odp-dpdk: 10.10.1.0 -> 2016-08-16 2016-09-03 21:20:52 +02:00
open-iscsi openiscsi: fix a file that was broken by upstream changing things to dynamic linking 2016-04-30 15:29:49 -03:00
open-isns treewide: Add lots of meta.platforms 2016-08-02 21:42:43 +03:00
opengl/xorg-sys treewide: Add lots of platforms to packages with no meta 2016-08-02 21:17:44 +03:00
openvswitch openvswitch: 2.3.1 -> 2.5.0 (#15729) 2016-05-28 16:02:04 +02:00
otpw otpw: disable stackprotector hardening 2016-08-24 17:19:43 +00:00
pagemon pagemon: 0.01.07 -> 0.01.08 2016-02-08 21:06:08 +01:00
pam Merge commit staging+systemd into closure-size 2015-10-03 13:33:37 +02:00
pam_ccreds treewide: Add lots of meta.platforms 2016-08-02 21:42:43 +03:00
pam_krb5
pam_ldap
pam_mount pam_mount: fix PATH issue 2015-07-04 16:36:47 +02:00
pam_pgsql quote homepages for better clickability 2016-08-14 22:37:10 +03:00
pam_ssh_agent_auth
pam_u2f pam_u2f: 1.0.1 -> 1.0.4 2016-01-29 20:49:29 +02:00
pam_usb Remove top-level dbus_python and pythonDBus. 2016-08-16 22:52:37 +02:00
pax-utils pax-utils: https urls 2016-03-11 22:36:22 +01:00
paxctl Use general hardening flag toggle lists 2016-03-05 18:55:26 +01:00
paxtest paxtest: refactoring 2016-05-24 16:14:41 +02:00
pcmciautils treewide: Add lots of meta.platforms 2016-08-02 21:42:43 +03:00
perf-tools perf-tools: 20150723 -> 20160418 2016-07-04 12:29:31 +02:00
pflask pflask: use waf package 2016-02-10 20:34:28 +01:00
phc-intel phc-intel: 0.4.0rev19 -> 0.4.0rev22 2016-09-02 07:41:42 -04:00
pipework replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
pktgen pktgen: disable parallel building 2016-09-19 05:28:43 +03:00
plymouth plymouth: 0.9.0 -> 0.9.2 2016-07-12 22:22:28 +03:00
pm-utils makeSearchPathOutputs: refactor to makeSearchPathOutput 2016-04-25 13:24:39 +03:00
pmount
pmtools Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
policycoreutils policycoreutils: fix i686-linux compilation error, closes #9544 2015-08-31 09:39:07 +02:00
pommed treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
powerstat powerstat: init at 0.02.10 2016-07-16 12:09:40 +08:00
powertop powertop: call "xset" from $PATH 2016-01-31 21:44:36 +01:00
prl-tools linuxPackages.prl-tools: disable pic hardening 2016-08-13 16:40:42 +02:00
procps Remove cruft 2016-04-26 17:31:54 +02:00
procps-ng procps-ng: 3.3.10 -> 3.3.11 2015-08-18 11:12:34 -07:00
psmisc
radeontools
radeontop radeontop: 2016-07-03 -> 2016-07-04 2016-07-05 09:29:42 +02:00
read-edid read-edid: New package at version 3.0.2 2015-06-15 17:49:35 +02:00
regionset regionset: 20030629 -> 0.2 2016-01-13 03:30:56 +01:00
reptyr reptyr: 0.5 -> 0.6.2 2015-08-27 10:11:11 +02:00
rewritefs rewritefs: 2016-02-08 -> 2016-07-27 2016-07-27 03:51:08 +02:00
rfkill
rtkit
rtl8723bs Merge pull request #18073 from joachifm/rtl8723bs 2016-09-01 14:48:51 +02:00
rtl8812au linuxPackages.rtl8812au: fix build 2016-08-14 08:59:55 +00:00
s6-linux-utils update skarnet.org packages 2016-04-01 10:38:58 -05:00
schedtool schedtool: add package 2015-04-22 17:50:41 +03:00
sdparm treewide: Add lots of meta.platforms 2016-08-02 21:42:43 +03:00
sepolgen sepolgen: 1.2.1 -> 1.2.2 2015-07-31 17:11:11 -07:00
setools Use general hardening flag toggle lists 2016-03-05 18:55:26 +01:00
seturgent fix: add missing versions 2015-06-04 23:34:14 +03:00
shadow shadow: Separate man output 2016-09-05 14:53:27 +02:00
sinit treewide: fix darwin builds by using getOutput 2016-08-25 08:44:20 +00:00
smem
smemstat smemstat: init at 0.01.14 2016-07-16 12:09:40 +08:00
spl spl: fix evaluation after the parent commit 2016-09-03 14:34:55 +02:00
statifier Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-17 21:30:43 +01:00
syscall_limiter syscall_limiter: init at b02c031 2016-01-05 15:37:17 +00:00
sysdig Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
sysfsutils treewide: Add lots of meta.platforms 2016-08-02 21:42:43 +03:00
sysklogd sysklogd: fix compile error (#18133) 2016-08-31 00:05:07 +02:00
syslinux syslinux: disable fortify hardening 2016-04-03 12:51:54 +00:00
sysstat sysstat: 11.0.7 -> 11.2.5 2016-06-30 21:39:50 +08:00
systemd systemd: Separate lib output 2016-09-05 19:17:14 +02:00
sysvinit
tcp-wrappers tcp_wrappers: Remove separate builder.sh and use standard stdenv phases 2016-05-14 21:05:58 +03:00
thin-provisioning-tools thin-provisioning-tools: init at 0.6.1 2016-02-15 12:57:15 +01:00
tiptop tiptop: init at 2.3 2016-07-26 11:55:23 +02:00
tomb tomb: init at version 2.2 2016-04-22 17:07:26 -04:00
tp_smapi Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
trace-cmd Captialize meta.description of all packages 2016-06-20 13:55:52 +02:00
trinity trinity: 1.5 -> 1.6 2015-11-08 20:09:17 +02:00
ttysnoop
tunctl treewide: Add lots of meta.platforms 2016-08-02 21:42:43 +03:00
uclibc Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
udev udev182: fix build against linux 4.4 headers 2016-05-16 01:35:57 +02:00
udisks Remove no longer (or never) referenced patches 2016-01-24 02:02:21 +01:00
udisks-glue
untie Remove unneeded 'with's from meta.platforms 2015-11-25 23:06:09 +01:00
upower upower: 0.99.3 -> 0.99.4 2016-03-07 02:04:20 +00:00
upstart treewide: Add lots of meta.platforms 2016-08-02 21:42:43 +03:00
usbutils Fix usbutils 2015-05-15 11:10:03 +02:00
usermount Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
util-linux util-linux: Split 'dev' 2016-09-10 19:05:05 +03:00
v4l2loopback Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
v4l-utils treewide: Shuffle outputs 2016-08-29 14:49:51 +03:00
v86d Use general hardening flag toggle lists 2016-03-05 18:55:26 +01:00
virtualbox virtualbox: Split kernel modules into own package 2016-09-13 06:12:38 +02:00
wireguard wireguard: disable build against -grsec kernels 2016-09-03 14:50:07 +02:00
wireless-tools treewide: Add lots of platforms to packages with no meta 2016-08-02 21:17:44 +03:00
wpa_supplicant treewide: Make explicit that 'dev' output of libnl is used 2016-05-19 10:00:43 +02:00
wvdial
x86_energy_perf_policy x86_energy_perf_policy: correct meta.homepage 2016-05-08 19:42:49 +02:00
x86info
xf86-input-mtrack treewide: Add lots of meta.platforms 2016-08-02 21:42:43 +03:00
xf86-input-multitouch Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
xf86-input-wacom xf86-input-wacom: 0.31.0 -> 0.32.0 2016-01-01 14:16:32 +01:00
xf86-video-nested Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
xsensors xsensors: init at 0.70 2015-07-03 22:55:10 -04:00
zfs Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00