Orivej Desh 59bcd86640 Merge branch 'master' into staging ... * master: (53 commits) hashcat: 4.0.0 -> 4.0.1 vault: add nixos test emem: 0.2.48 -> 0.2.50 nixos/nat: add dmzHost option (#32257) vulnix: 1.3.4 -> 1.4.0 linux-4.13: mark as insecure (+required generic changes) vault: 0.8.3 -> 0.9.0 gox: 20140904 -> 0.4.0 guitarix: 0.35.6 -> 0.36.1 geolite-legacy: 2017-10-25 -> 2017-12-02 premake5: 5.0.0pre.alpha.11 -> 5.0.0-alpha12 otfcc: build with ninja python/hetzner: 0.7.5 -> 0.8.0 linux-testing: 4.15-rc1 -> 4.15-rc2 Revert "linux_4_13: Remove, no longer supported." jenkins: 2.92 -> 2.93 psc-package: 0.2.4 -> 0.2.5 dino: 2017-09-26 -> 2017-12-03 gnome3.gpaste: fix keybindings path plasma: 5.11.3 -> 5.11.4 ...		2017-12-04 15:25:34 +00:00
..
arduino
beam-modules
bower-modules/generic
compilers	Merge branch 'master' into staging	2017-12-04 15:25:34 +00:00
coq-modules
dotnet-modules/patches
eclipse/ecj
em-modules/generic
go-modules
guile-modules
haskell-modules	Merge pull request #32112 from nc6/hask-split-out	2017-12-04 12:36:45 +01:00
idris-modules	specdris: init at 2017-11-11 (#31544)	2017-11-21 22:59:38 +00:00
interpreters	j: fix build	2017-12-02 06:04:00 +00:00
java-modules
libraries	libunistring: 0.9.7 -> 0.9.8	2017-12-04 14:03:44 +01:00
lisp-modules	lispPackages: A less aggressive way to manipulate ASDF search path, as suggested by Fare	2017-11-22 07:56:17 +01:00
lua-modules
misc
mobile
node-packages	nodePackages.html-minifier: init at 3.5.7	2017-11-27 05:10:39 -05:00
ocaml-modules	ocamlPackages.ptmap: 2.0.2 -> 2.0.3	2017-12-03 07:43:46 +00:00
perl-modules	stdenv setup: Always use both propagated files	2017-11-21 10:44:44 -05:00
pharo
pure-modules
python-modules	Merge branch 'master' into staging	2017-12-02 09:37:07 +01:00
qtcreator
r-modules	R: update package set	2017-12-01 13:48:26 +01:00
ruby-modules
tools	Merge branch 'master' into staging	2017-12-04 15:25:34 +00:00
web	Merge pull request #31710 from adisbladis/nodejs-9_2_0	2017-11-17 19:22:37 +00:00