nixpkgs/pkgs/desktops/gnome-3/games
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
..
aisleriot gnome3.aisleriot: 3.22.7 -> 2.22.8 2019-04-05 12:13:48 +02:00
atomix gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
five-or-more treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
four-in-a-row treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
gnome-chess treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
gnome-klotski gnome3.gnome-klotski: 3.22.3 -> 3.32.0 2019-04-05 12:13:41 +02:00
gnome-mahjongg treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
gnome-mines treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
gnome-nibbles Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
gnome-robots treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
gnome-sudoku treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
gnome-taquin treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
gnome-tetravex treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
hitori gnome3.hitori: 3.31.92 → 3.32.0 2019-08-24 02:54:20 +02:00
iagno treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
lightsoff treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
quadrapassel gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
swell-foop gnome3.swell-foop: 3.30.0 -> 3.32.0 2019-04-05 12:13:46 +02:00
tali Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00