3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

5 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
Eugene 6f494e57ec docui: add maintainer 2019-08-18 13:36:35 +03:00
Eugene 41797ac53f docui: 1.0.3 -> 2.0.0 2019-08-18 13:36:19 +03: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
Eugene e334a3047a docui: init at 1.0.3 (#60616) 2019-05-01 12:35:24 -07:00