Jan Malakhovski 7079e744d4 Merge branch 'master' into staging ... Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix		2018-03-10 20:38:13 +00:00
..
assertions.nix	Remove some obsolete references to <nixos>	2015-08-05 17:37:08 +02:00
crashdump.nix	nixos/crashdump: fix evaluation. (#30415)	2017-10-25 20:00:52 +00:00
extra-arguments.nix	nixos: use pkgsi686Linux for pkgs_i686 (#24772)	2017-04-26 18:20:38 +02:00
ids.nix	Merge #35454: nixos/pump.io: remove	2018-03-04 10:49:25 +01:00
label.nix	nixos/label: no prepend '-' if there are no tags	2018-02-22 19:44:21 +00:00
lib.nix
locate.nix	nixos/locatedb: fix first run when /var/cache doesn't exist	2017-10-11 14:59:18 +02:00
meta.nix	lib: introduce imap0, imap1 (#25543)	2017-07-04 23:29:23 +01:00
nixpkgs.nix	nixos: Add nixpkgs.crossSystem option for cross-compilation	2018-03-01 14:58:15 -05:00
passthru.nix
version.nix	nixos: rename config.system.nixos* -> config.system.nixos.*	2018-02-18 12:56:30 +00:00