Tuomas Tynkkynen 4c6c919a31 Merge remote-tracking branch 'upstream/master' into HEAD ... Conflicts: pkgs/os-specific/linux/kernel/generic.nix		2018-02-07 03:41:24 +02:00
..
arduino
beam-modules	Add setFunctionArgs lib function.	2018-01-31 14:02:19 -05:00
bower-modules/generic
compilers	Merge remote-tracking branch 'upstream/master' into HEAD	2018-02-07 03:41:24 +02:00
coq-modules
dotnet-modules/patches
eclipse/ecj
em-modules/generic
go-modules
guile-modules
haskell-modules	Merge pull request #34404 from deepfire/x-ghc-8.4-overrides	2018-02-06 10:01:15 +01:00
idris-modules	Undo spacing difference	2018-02-03 10:17:24 +01:00
interpreters	python35: 3.5.4 -> 3.5.5	2018-02-05 11:53:38 +01:00
java-modules
libraries	Merge remote-tracking branch 'upstream/master' into HEAD	2018-02-07 03:41:24 +02:00
lisp-modules	lispPackages.clwrapper: Fix a typo in dynamic-library-hack	2018-02-01 21:32:21 +01:00
lua-modules
misc
mobile	xpwn: build usb-based tools by replacing libusb1 dep with libusb	2018-02-01 14:15:02 -06:00
node-packages	nodePackages_8_x.pnpm: init at 1.31.0	2018-01-26 14:43:46 +08:00
ocaml-modules
perl-modules
pharo
pure-modules
python-modules	Merge remote-tracking branch 'upstream/master' into HEAD	2018-02-07 03:41:24 +02:00
qtcreator
r-modules
ruby-modules
stm32/betaflight
tools	autoconf-archive: 2017.03.21 -> 2017.09.28	2018-02-06 07:35:31 -08:00
web	nodejs: 9.4.0 -> 9.5.0	2018-02-04 03:06:30 +08:00