Commit graph

6 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
Raphael Das Gupta aa0f96cfb4 libosmium: 2.15.1 -> 2.15.2 2019-08-21 14:46:42 +02: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
R. RyanTM 59db0ca1ea libosmium: 2.15.0 -> 2.15.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/libosmium/versions
2019-03-10 13:12:09 -07:00
R. RyanTM 2bae825da1 libosmium: 2.14.2 -> 2.15.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libosmium/versions
2018-12-15 07:04:11 -08:00
Raphael Borun Das Gupta 78dbe69543 libosmium: init at 2.14.2 2018-11-03 00:36:28 +01:00