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
..
slurm	Merge staging-next into staging	2019-08-17 09:39:23 +02:00
slurm-spank-x11
storm	pkgs/*: remove unreferenced function arguments	2018-07-21 02:48:04 +00:00
torque	torque: remove commented-out sbin handling	2019-08-23 15:58:53 +02:00