Orivej Desh 1161741351 Merge branch 'master' into staging ... * master: (28 commits) go_1_9: skip flaky TestWaitGroupMisuse2 erlangR18: fix patch hashes with fetchpatch xml2: replace dead links nixos/pam: fix docs about path to u2f_keys file cinelerra: add a note about parallel building msmtp: install docs and examples (#31769) kernel: Fix out-of-tree modules on aarch64 nixos/tests/acme: update terms of service to fix test gixy: init at 0.1.8 pythonPackages.ConfigArgParse: 0.9.3 -> 0.12.0, refactor, move to python-modules mono: init at 4.8 wal-g: fix license so not to break evaluation wal-g: init at 0.1.2 maintainers: add backuitist nixos/prometheus: Correct documentation for external_labels spidermonkey: replace broken links vagrant: removed custom rake gem vagrant: 2.0.0 -> 2.0.1 nixos/prometheus: add external_labels option nixos/prometheus: add scrape_configs.honor_labels ...		2017-11-17 18:06:22 +00:00
..
systems	kernel: add beagleboard.org kernel	2017-11-09 18:28:14 +02:00
tests	lib/types: add ints.positive.	2017-11-05 15:56:32 +01:00
attrsets.nix	Convert libs to a fixed-point	2017-09-16 21:36:43 -04:00
composable-derivation.nix	lib: trivial spelling fixes	2017-04-19 19:37:55 -05:00
customisation.nix	Revert "Merge branch 'improved-make-overridable' of git://github.com/ElvishJerricco/nixpkgs"	2017-09-29 09:11:26 -04:00
debug.nix	Convert libs to a fixed-point	2017-09-16 21:36:43 -04:00
default.nix	Revert "Fix evaluation"	2017-09-29 09:10:48 -04:00
deprecated.nix	Convert libs to a fixed-point	2017-09-16 21:36:43 -04:00
fetchers.nix	Convert libs to a fixed-point	2017-09-16 21:36:43 -04:00
filesystem.nix	Convert libs to a fixed-point	2017-09-16 21:36:43 -04:00
fixed-points.nix	Revert "Merge branch 'improved-make-overridable' of git://github.com/ElvishJerricco/nixpkgs"	2017-09-29 09:11:26 -04:00
generators.nix	Convert libs to a fixed-point	2017-09-16 21:36:43 -04:00
licenses.nix	licenses.ffsl: non-free	2017-11-03 22:42:25 +01:00
lists.nix	Convert libs to a fixed-point	2017-09-16 21:36:43 -04:00
maintainers.nix	Merge branch 'master' into staging	2017-11-17 18:06:22 +00:00
meta.nix	Convert libs to a fixed-point	2017-09-16 21:36:43 -04:00
minver.nix	Nix minimal version: 1.10 -> 1.11	2017-08-22 13:28:55 +03:00
modules.nix	lib/modules: Change type error to be gramatically nicer	2017-11-05 15:56:32 +01:00
options.nix	Convert libs to a fixed-point	2017-09-16 21:36:43 -04:00
sources.nix	Convert libs to a fixed-point	2017-09-16 21:36:43 -04:00
strings-with-deps.nix	Convert libs to a fixed-point	2017-09-16 21:36:43 -04:00
strings.nix	Convert libs to a fixed-point	2017-09-16 21:36:43 -04:00
trivial.nix	Convert libs to a fixed-point	2017-09-16 21:36:43 -04:00
types.nix	lib/types.nix: Disable 32-bit integer types for now	2017-11-05 22:47:09 +02:00