Tuomas Tynkkynen ef64208eba Merge commit '3ab2949' from staging into master ...

Conflicts:
	pkgs/development/compilers/llvm/6/llvm.nix
	pkgs/servers/home-assistant/component-packages.nix

2018-03-15 22:30:56 +02: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

Get all lib functions from lib, not pkgs.lib, in modules

2014-07-02 12:28:18 -04:00

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

Get all lib functions from lib, not pkgs.lib, in modules

2014-07-02 12:28:18 -04:00

version.nix

18.09: let's call it "Jackrabbit"

2018-03-14 15:13:34 +01:00