Commit graph

7 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 7febeb3ddf xxHash: 0.7.0 -> 0.7.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xxhash/versions
2019-08-21 00:04:32 -07: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
Orivej Desh caa5ad4327 xxHash: 0.6.5 -> 0.7.0 2019-03-15 20:32:16 +00:00
Orivej Desh bccab16109 xxHash: 0.6.4.20171222 -> 0.6.5 2019-02-24 19:40:29 +00:00
John Children f3cc6672c7 xxHash: 0.6.3.20171018 -> 0.6.4.20171222
Updated version of xxHash features a library target that may be useful
for some packages.
2018-04-18 12:42:06 +01:00
Dmitry Kalinkin 4d85689cf3
xxHash: init at 0.6.3.20171018 2017-10-20 00:59:15 -04:00