4 Commits

Author	SHA1	Message	Date
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
R. RyanTM	df771cf289	memtier-benchmark: 1.2.11 -> 1.2.17 ... Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/memtier-benchmark/versions	2019-08-19 19:29:28 -05:00
volth	46420bbaa3	treewide: name -> pname (easy cases) (#66585) ... treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname	2019-08-15 13:41:18 +01:00
Austin Seipp	efbeb74d0d	memtier-benchmark: init at 1.2.11 ... Signed-off-by: Austin Seipp <aseipp@pobox.com>	2018-03-24 04:18:45 -05:00