3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/desktops/gnome-2
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
..
bindings treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
desktop treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
platform treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
default.nix pin some packages to openssl 1.0.2 for now 2019-07-29 21:25:10 +02:00