3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/data
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
..
documentation treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
fonts Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
icons Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
machine-learning/mnist mnist: init at 2018-11-16 2018-12-03 14:20:55 +11:00
misc Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
sgml+xml docbook5: 5.0 -> 5.0.1 2019-07-20 12:39:16 +02:00
soundfonts/fluid pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
themes Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00