nixpkgs/pkgs/tools/nix
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
..
info nix-info: use checkInputs 2018-08-11 09:35:26 +00:00
nix-script treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
nixdoc treewide: remove unused variables (#63177) 2019-06-16 19:59:05 +00:00
nixpkgs-fmt nixpkgs-fmt: init at 0.2.0 2019-08-23 16:12:50 +02:00