Commit Graph

4 Commits

Author SHA1 Message Date
Vladimír Čunát
985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +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
f52fb530a4 libcacard: 2.6.1 -> 2.7.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/libcacard/versions
2019-08-04 08:24:07 -07:00
Yegor Timoshenko
1ae8d8b793
libcacard: init at 2.6.1 2018-10-12 20:38:55 +00:00