Commit Graph

8 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
ac8f6a4b76 ktlint: 0.34.0 -> 0.34.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ktlint/versions
2019-08-19 07:40:17 -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
R. RyanTM
730ac18ebe ktlint: 0.33.0 -> 0.34.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/ktlint/versions
2019-07-19 10:37:38 -07:00
R. RyanTM
9657693e20 ktlint: 0.32.0 -> 0.33.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/ktlint/versions
2019-06-01 18:29:38 -07:00
R. RyanTM
1f84f67dce ktlint: 0.31.0 -> 0.32.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/ktlint/versions
2019-05-01 11:09:51 +02:00
R. RyanTM
754fdc235e ktlint: 0.30.0 -> 0.31.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/ktlint/versions
2019-03-25 11:46:50 -07:00
Tad Fisher
b1eb421c1a ktlint: init at 0.30.0 2019-02-17 13:44:55 -08:00