Tuomas Tynkkynen 6ed0fe7e45 Merge remote-tracking branch 'upstream/master' into staging ...

Conflicts:
	pkgs/build-support/fetchbower/default.nix
	pkgs/build-support/fetchdarcs/default.nix
	pkgs/build-support/fetchgx/default.nix
	pkgs/development/python-modules/botocore/default.nix
	pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
	pkgs/tools/admin/awscli/default.nix

2018-01-14 21:18:27 +02:00

..

arduino

arduino: 1.8.2 -> 1.8.5

2018-01-07 15:45:46 +01:00

beam-modules

Elixir: init 1.6-rc.0 (#33034)

2017-12-26 16:53:24 -05:00

bower-modules/generic

…

compilers

Merge remote-tracking branch 'upstream/master' into staging

2018-01-14 21:18:27 +02:00

coq-modules

coqPackages.tlc: init at 20171206

2017-12-28 08:19:54 +01:00

dotnet-modules/patches

…

eclipse/ecj

…

em-modules/generic

…

go-modules

…

guile-modules

…

haskell-modules

add haddock version for GHC 8.0

2018-01-13 01:17:23 -08:00

idris-modules

treewide: Don't use envHook anymore

2017-12-30 22:04:22 -05:00

interpreters

Merge remote-tracking branch 'upstream/master' into staging

2018-01-14 21:18:27 +02:00

java-modules

…

libraries

Merge remote-tracking branch 'upstream/master' into staging

2018-01-14 21:18:27 +02:00

lisp-modules

Merge pull request #26805 from obsidiansystems/cross-elegant

2017-12-30 22:58:02 -05:00

lua-modules

…

misc

avrgcc: bake path to avr-ar into avr-gcc-ar

2018-01-12 00:48:35 +00:00

mobile

titaniumenv: add hack to reduce keychain blocking problems

2018-01-09 13:24:30 +01:00

node-packages

nodePackages: regenerate with node2nix 1.5.1

2018-01-10 21:59:18 +01:00

ocaml-modules

ocamlPackages.mstruct: 1.3.3 -> 1.4.0

2018-01-14 06:28:13 +01:00

perl-modules

mariadb: lib -> connector-c

2017-12-29 02:18:35 +01:00

pharo

pharo: disable on darwin

2018-01-02 19:19:37 +01:00

pure-modules

treewide: generalise for both mysql & mariadb

2017-12-29 02:18:35 +01:00

python-modules

Merge remote-tracking branch 'upstream/master' into staging

2018-01-14 21:18:27 +02:00

qtcreator

…

r-modules

Merge pull request #33010 from LnL7/cacert-hook

2018-01-07 09:55:15 +01:00

ruby-modules

ruby-modules: Add new url source type

2018-01-04 07:54:30 -08:00

stm32/betaflight

betaflight: init at 3.2.3

2018-01-04 14:04:40 -08:00

tools

Merge remote-tracking branch 'upstream/master' into staging

2018-01-14 21:18:27 +02:00

web

woff2: set platforms to linux only

2018-01-13 12:43:18 +01:00