5 commits

Author	SHA1	Message	Date
John Ericson	51991e9606	Merge branch 'wrapper-pname-support-19.09' into wrapper-pname-support	2019-11-24 17:37:19 +00:00
John Ericson	d0d5136cce	Merge remote-tracking branch 'upstream/master' into wrapper-pname-support	2019-11-24 17:25:07 +00:00
Théo Zimmermann	eebdaa936f	doc: fix allowUnfreePredicate example following the introduction of pname ... Co-Authored-By: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>	2019-11-09 09:47:26 +01:00
Frederik Rietdijk	aad81ec8cd	nixpkgs manual: fix white space and indentation	2019-10-30 11:17:14 +01:00
Frederik Rietdijk	6f7b4b9ee8	nixpkgs manual: move using chapters into one folder	2019-10-30 11:17:14 +01:00