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

..

documentation

treewide: homepage+src updates (found by repology, #33263)

2018-01-05 20:42:46 +01:00

fonts

fantasque-sans-mono: 1.7.1 -> 1.7.2

2018-01-14 17:10:43 +01:00

icons

paper-icon-theme: 2017-02-13 -> 2017-11-20

2018-01-12 17:58:20 -02:00

misc

iana-etc: 20171106 -> 20180108

2018-01-13 09:45:51 +00:00

sgml+xml

docbook_xsl_*: Remove builder.sh

2017-12-03 01:50:43 +02:00

soundfonts/fluid

pkgs: refactor needless quoting of homepage meta attribute (#27809)

2017-08-01 22:03:30 +02:00