Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3a9ff67cc8d4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 63a022568371
Choose a head ref
  • 10 commits
  • 10 files changed
  • 1 contributor

Commits on Mar 11, 2019

  1. Copy the full SHA
    cd771b9 View commit details
  2. Copy the full SHA
    04b04dd View commit details
  3. Copy the full SHA
    c99aa54 View commit details
  4. Copy the full SHA
    87c62e7 View commit details
  5. Copy the full SHA
    ebd689c View commit details
  6. Copy the full SHA
    6105113 View commit details
  7. Copy the full SHA
    04ccfc0 View commit details
  8. Copy the full SHA
    d6fe66f View commit details
  9. Copy the full SHA
    c97b4e2 View commit details
  10. gnome3.tali: 3.22.0 -> 3.32.0

    hedning committed Mar 11, 2019
    Copy the full SHA
    63a0225 View commit details
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/games/atomix/default.nix
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

let
pname = "atomix";
version = "3.30.0.1";
version = "3.32.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0hvr36m8ixa172zblv29fga1cn9yb84zqbisb21msfkwia2pabw3";
sha256 = "0qxmdrmqsxpfv6w0l557jsjbd7cpdf3jni5mdhnsr4h2n8knf7m0";
};

nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 ];
17 changes: 13 additions & 4 deletions pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, gettext, itstool, libcanberra-gtk3, librsvg, libxml2 }:
, gettext, meson, libcanberra-gtk3, librsvg, itstool, vala
, python3, ninja, desktop-file-utils }:

stdenv.mkDerivation rec {
name = "four-in-a-row-${version}";
version = "3.28.0";
version = "3.32.0";

src = fetchurl {
url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1iszaay2r92swb0q67lmip6r1w3hw2dwmlgnz9v2h6blgdyncs4k";
sha256 = "0h4wmbkdp7x3gp9sbxmvla316m8n6iy4f5sq0ksldj0z7ghlx9zl";
};

nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext itstool libxml2 ];
nativeBuildInputs = [
pkgconfig wrapGAppsHook gettext meson itstool vala
ninja python3 desktop-file-utils
];
buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.adwaita-icon-theme ];

postPatch = ''
chmod +x build-aux/meson_post_install.py
patchShebangs build-aux/meson_post_install.py
'';

passthru = {
updateScript = gnome3.updateScript {
packageName = "four-in-a-row";
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/games/gnome-chess/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@

stdenv.mkDerivation rec {
name = "gnome-chess-${version}";
version = "3.30.1";
version = "3.32.0";

src = fetchurl {
url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1gzdm6z54kxx06lh616g33klrp4dby2a68wxvjpsavdll28kgwgl";
sha256 = "0hzb6s4wmfy1fysagc5hmn1ijvrwyd2cg7iz41mpn7gfdjyak639";
};

nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ];
21 changes: 16 additions & 5 deletions pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
Original file line number Diff line number Diff line change
@@ -1,19 +1,30 @@
{ stdenv, fetchurl, pkgconfig, vala, gnome3, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils
, glib, librsvg, libxml2, intltool, itstool, libgee, libgnome-games-support }:
, glib, librsvg, libxml2, gettext, itstool, libgee, libgnome-games-support
, meson, ninja, python3
}:

let
pname = "gnome-klotski";
version = "3.22.3";
version = "3.32.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0prc0s28pdflgzyvk1g0yfx982q2grivmz3858nwpqmbkha81r7f";
sha256 = "1p4s15gxj6gasix22z9vlx2yrx196fvcxr6v6qrl569idfgjbi72";
};

nativeBuildInputs = [ pkgconfig vala wrapGAppsHook intltool itstool libxml2 appstream-glib desktop-file-utils ];
buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support gnome3.adwaita-icon-theme ];
nativeBuildInputs = [
pkgconfig vala meson ninja python3 wrapGAppsHook
gettext itstool libxml2 appstream-glib desktop-file-utils
gnome3.adwaita-icon-theme
];
buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support ];

postPatch = ''
chmod +x build-aux/meson_post_install.py
patchShebangs build-aux/meson_post_install.py
'';

passthru = {
updateScript = gnome3.updateScript {
23 changes: 17 additions & 6 deletions pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
Original file line number Diff line number Diff line change
@@ -1,25 +1,36 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, librsvg, intltool, itstool, libxml2 }:
, librsvg, gettext, itstool, libxml2
, meson, ninja, python3, vala, desktop-file-utils
}:

stdenv.mkDerivation rec {
name = "gnome-mahjongg-${version}";
version = "3.22.0";
version = "3.32.0";

src = fetchurl {
url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "f5972a14fa4ad04153bd6e68475b85cd79c6b44f6cac1fe1edb64dbad4135218";
sha256 = "12kamxnxbh26k4iykhbs873mx25a2wrjnhr013lfkwbyl52kg12j";
};

passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-mahjongg"; attrPath = "gnome3.gnome-mahjongg"; };
};

nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [
meson ninja vala python3 desktop-file-utils
pkgconfig gnome3.adwaita-icon-theme
libxml2 itstool gettext wrapGAppsHook
];
buildInputs = [
gtk3 wrapGAppsHook librsvg intltool itstool libxml2
gnome3.adwaita-icon-theme
gtk3 librsvg
];

postPatch = ''
chmod +x data/meson_post_install.py
patchShebangs data/meson_post_install.py
'';


meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Mahjongg;
description = "Disassemble a pile of tiles by removing matching pairs";
22 changes: 15 additions & 7 deletions pkgs/desktops/gnome-3/games/gnome-robots/default.nix
Original file line number Diff line number Diff line change
@@ -1,26 +1,34 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, librsvg, libcanberra-gtk3, intltool, itstool, libxml2, libgnome-games-support
, libgee}:
, librsvg, libcanberra-gtk3, gettext, itstool, libxml2, libgnome-games-support
, libgee, meson, ninja, python3, desktop-file-utils }:

stdenv.mkDerivation rec {
name = "gnome-robots-${version}";
version = "3.22.3";
version = "3.32.0";

src = fetchurl {
url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0dzcjd7rdmlzgr6rmljhrbccwif8wj0cr1xcrrj7malj33098wwk";
sha256 = "1xp1sijl5k7wmnbb0hdgh4ajxgp74k7fcnmd5c6rw6lf51wpinyh";
};

passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-robots"; attrPath = "gnome3.gnome-robots"; };
};

nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [
pkgconfig meson ninja python3
libxml2 gnome3.adwaita-icon-theme
wrapGAppsHook gettext itstool desktop-file-utils
];
buildInputs = [
gtk3 wrapGAppsHook intltool itstool librsvg libcanberra-gtk3
libxml2 gnome3.adwaita-icon-theme libgnome-games-support libgee
gtk3 librsvg libcanberra-gtk3 libgnome-games-support libgee
];

postPatch = ''
chmod +x build-aux/meson_post_install.py
patchShebangs build-aux/meson_post_install.py
'';

meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Robots;
description = "Avoid the robots and make them crash into each other";
8 changes: 4 additions & 4 deletions pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
Original file line number Diff line number Diff line change
@@ -3,19 +3,19 @@

stdenv.mkDerivation rec {
name = "gnome-sudoku-${version}";
version = "3.30.0";
version = "3.32.0";

src = fetchurl {
url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1xy986s51jnrcqwan2hy4bjdg6797yr9s7gxx2z2q4j4gkx3qa1f";
sha256 = "1wwdjflw1lbx3cv6gvqcgp5jnjkrq37ld6mjbjj03g3vr90qaf0l";
};

nativeBuildInputs = [ meson ninja vala pkgconfig gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ];
buildInputs = [ gtk3 libgee json-glib qqwing ];

postPatch = ''
chmod +x post_install.py # patchShebangs requires executable file
patchShebangs post_install.py
chmod +x build-aux/post_install.py
patchShebangs build-aux/post_install.py
'';

passthru = {
20 changes: 15 additions & 5 deletions pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
Original file line number Diff line number Diff line change
@@ -1,24 +1,34 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, libxml2, intltool, itstool }:
, libxml2, gettext, itstool, meson, ninja, python3
, vala, desktop-file-utils
}:

stdenv.mkDerivation rec {
name = "gnome-tetravex-${version}";
version = "3.22.0";
version = "3.32.0";

src = fetchurl {
url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0a6d7ff5ffcd6c05454a919d46a2e389d6b5f87bc80e82c52c2f20d9d914e18d";
sha256 = "18drxp43j2jnywxl6qa7mn1iv33jxr0dpc1l9xza3lnrb0jp0kjl";
};

passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome3.gnome-tetravex"; };
};

nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [
wrapGAppsHook itstool libxml2 gnome3.adwaita-icon-theme
pkgconfig gettext meson ninja python3 vala desktop-file-utils
];
buildInputs = [
gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.adwaita-icon-theme
gtk3
];

postPatch = ''
chmod +x build-aux/meson_post_install.py
patchShebangs build-aux/meson_post_install.py
'';

meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Tetravex;
description = "Complete the puzzle by matching numbered tiles";
18 changes: 12 additions & 6 deletions pkgs/desktops/gnome-3/games/quadrapassel/default.nix
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf
, librsvg, libcanberra-gtk3
, intltool, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook }:
, librsvg, libcanberra-gtk3, libmanette
, gettext, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook
, meson, ninja, python3, vala, desktop-file-utils
}:

let
pname = "quadrapassel";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "3.22.0";
version = "3.32.0";

src = fetchurl {
url = "mirror://gnome/sources/quadrapassel/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0ed44ef73c8811cbdfc3b44c8fd80eb6e2998d102d59ac324e4748f5d9dddb55";
sha256 = "1zhi1957knz9dm98drn2dh95mr33sdch590yddh1f8r6bzsfjvpy";
};

nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ];
nativeBuildInputs = [
meson ninja python3 vala desktop-file-utils
pkgconfig gnome3.adwaita-icon-theme
libxml2 itstool gettext wrapGAppsHook
];
buildInputs = [
gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg
gtk3 gdk_pixbuf librsvg libmanette
libcanberra-gtk3 clutter libxml2 clutter-gtk
];

22 changes: 16 additions & 6 deletions pkgs/desktops/gnome-3/games/tali/default.nix
Original file line number Diff line number Diff line change
@@ -1,22 +1,32 @@
{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf
, librsvg, intltool, itstool, libxml2, wrapGAppsHook }:
, librsvg, gettext, itstool, libxml2, wrapGAppsHook
, meson, ninja, python3, desktop-file-utils
}:

stdenv.mkDerivation rec {
name = "tali-${version}";
version = "3.22.0";
version = "3.32.0";

src = fetchurl {
url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "5ba17794d6fb06b794daaffa62a6aaa372b7de8886ce5ec596c37e62bb71728b";
sha256 = "0s5clkn0qm298mvphx1xdymg67w1p8vvgvypvs97k6lfjqijkx3v";
};

passthru = {
updateScript = gnome3.updateScript { packageName = "tali"; attrPath = "gnome3.tali"; };
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg
libxml2 itstool intltool wrapGAppsHook ];
nativeBuildInputs = [
meson ninja python3 desktop-file-utils
pkgconfig gnome3.adwaita-icon-theme
libxml2 itstool gettext wrapGAppsHook
];
buildInputs = [ gtk3 gdk_pixbuf librsvg ];

postPatch = ''
chmod +x build-aux/meson_post_install.py
patchShebangs build-aux/meson_post_install.py
'';

enableParallelBuilding = true;