git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #87202 from r-ryantm/auto-update/glade

gnome3.glade: 3.22.2 -> 3.36.0

commit59e2e44f5b8032a0dd82b9a183f452f72b9eadeb authorTor Hedin Brønner <torhedinbronner@gmail.com> dateFri 15 May 2020, 20:52 (7 years ago) parentb0774e2e20c329
6 files changed+84−43
pkgs/applications/editors/gnome-builder/default.nix+2−1 pkgs/desktops/gnome-3/apps/glade/default.nix−37 pkgs/desktops/gnome-3/default.nix+2−2 pkgs/development/libraries/libhandy/default.nix+13−3 pkgs/development/tools/glade/default.nix+65 pkgs/top-level/all-packages.nix+2
pkgs/applications/editors/gnome-builder/default.nix+2−1
@@ -9,6 +9,7 @@
99, gnome3
1010, libgit2-glib
1111, gobject-introspection
12+, glade
1213, gspell
1314, gtk-doc
1415, gtk3
@@ -65,7 +66,7 @@ stdenv.mkDerivation rec {
6566 ctags
6667 flatpak
6768 gnome3.devhelp
68− gnome3.glade
69+ glade
6970 libgit2-glib
7071 libpeas
7172 libportal
pkgs/desktops/gnome-3/apps/glade/default.nixdeleted−37
@@ -1,37 +0,0 @@
1−{ stdenv, intltool, fetchurl, python3
2−, pkgconfig, gtk3, glib, gobject-introspection
3−, wrapGAppsHook, itstool, libxml2, docbook_xsl
4−, gnome3, gdk-pixbuf, libxslt, gsettings-desktop-schemas }:
5−
6−stdenv.mkDerivation rec {
7− pname = "glade";
8− version = "3.22.2";
9−
10− src = fetchurl {
11− url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "08bayb1rrpblxf6jhhbw2n3c425w170is4l94pampldl4kmsdvzd";
13− };
14−
15− passthru = {
16− updateScript = gnome3.updateScript { packageName = "glade"; attrPath = "gnome3.glade"; };
17− };
18−
19− nativeBuildInputs = [
20− pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt libxml2 gobject-introspection
21− ];
22− buildInputs = [
23− gtk3 glib libxml2 python3 python3.pkgs.pygobject3
24− gsettings-desktop-schemas
25− gdk-pixbuf gnome3.adwaita-icon-theme
26− ];
27−
28− enableParallelBuilding = true;
29−
30− meta = with stdenv.lib; {
31− homepage = "https://wiki.gnome.org/Apps/Glade";
32− description = "User interface designer for GTK applications";
33− maintainers = teams.gnome.members;
34− license = licenses.lgpl2;
35− platforms = platforms.linux;
36− };
37−}
pkgs/desktops/gnome-3/default.nix+2−2
@@ -164,8 +164,6 @@ lib.makeScope pkgs.newScope (self: with self; {
164164
165165 ghex = callPackage ./apps/ghex { };
166166
167− glade = callPackage ./apps/glade { };
168−
169167 gnome-books = callPackage ./apps/gnome-books { };
170168
171169 gnome-boxes = callPackage ./apps/gnome-boxes { };
@@ -352,6 +350,8 @@ lib.makeScope pkgs.newScope (self: with self; {
352350
353351 inherit (pkgs) networkmanagerapplet; # added 2019-12-12
354352
353+ inherit (pkgs) glade; # added 2020-05-15
354+
355355 vino = throw "vino is deprecated, use gnome-remote-desktop instead."; # added 2020-03-13
356356
357357 gnome-screensaver = throw "gnome-screensaver is deprecated. If you are using GNOME Flashback, it now has a built-in lock screen. If you are using it elsewhere, you can try xscreenlock or other alternatives."; # added 2020-03-19
pkgs/development/libraries/libhandy/default.nix+13−3
@@ -1,6 +1,6 @@
1−{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala
1+{ stdenv, fetchFromGitLab, fetchpatch, meson, ninja, pkgconfig, gobject-introspection, vala
22, gtk-doc, docbook_xsl, docbook_xml_dtd_43
3−, gtk3, gnome3
3+, gtk3, gnome3, glade
44, dbus, xvfb_run, libxml2
55, hicolor-icon-theme
66}:
@@ -20,11 +20,21 @@ stdenv.mkDerivation rec {
2020 sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5";
2121 };
2222
23+ patches = [
24+ # Fix build with Glade 3.36.0
25+ # https://source.puri.sm/Librem5/libhandy/merge_requests/451
26+ (fetchpatch {
27+ url = "https://source.puri.sm/Librem5/libhandy/commit/887beedb467984ab5c7b91830181645fadef7849.patch";
28+ sha256 = "ZW6qCtHhXMsLsxgcOjVAukgPAhOdvFhxx0iAQEEk8GE=";
29+ excludes = [ "glade/glade-hdy-header-bar.c" ];
30+ })
31+ ];
32+
2333 nativeBuildInputs = [
2434 meson ninja pkgconfig gobject-introspection vala libxml2
2535 gtk-doc docbook_xsl docbook_xml_dtd_43
2636 ];
27− buildInputs = [ gnome3.gnome-desktop gtk3 gnome3.glade libxml2 ];
37+ buildInputs = [ gnome3.gnome-desktop gtk3 glade libxml2 ];
2838 checkInputs = [ dbus xvfb_run hicolor-icon-theme ];
2939
3040 mesonFlags = [
pkgs/development/tools/glade/default.nixnew file+65
@@ -0,0 +1,65 @@
1+{ stdenv
2+, gettext
3+, fetchurl
4+, python3
5+, pkg-config
6+, gtk3
7+, glib
8+, gobject-introspection
9+, wrapGAppsHook
10+, itstool
11+, libxml2
12+, docbook-xsl-nons
13+, gnome3
14+, gdk-pixbuf
15+, libxslt
16+, gsettings-desktop-schemas
17+}:
18+
19+stdenv.mkDerivation rec {
20+ pname = "glade";
21+ version = "3.36.0";
22+
23+ src = fetchurl {
24+ url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
25+ sha256 = "GbVGtSfMRiE8z8gCLUnsV+YY/iyqmqUdstKGIjPqbwg=";
26+ };
27+
28+ nativeBuildInputs = [
29+ pkg-config
30+ gettext
31+ itstool
32+ wrapGAppsHook
33+ docbook-xsl-nons
34+ libxslt
35+ libxml2
36+ gobject-introspection
37+ ];
38+
39+ buildInputs = [
40+ gtk3
41+ glib
42+ libxml2
43+ python3
44+ python3.pkgs.pygobject3
45+ gsettings-desktop-schemas
46+ gdk-pixbuf
47+ gnome3.adwaita-icon-theme
48+ ];
49+
50+ enableParallelBuilding = true;
51+
52+ passthru = {
53+ updateScript = gnome3.updateScript {
54+ packageName = pname;
55+ };
56+ };
57+
58+ meta = with stdenv.lib; {
59+ homepage = "https://wiki.gnome.org/Apps/Glade";
60+ description = "User interface designer for GTK applications";
61+ maintainers = teams.gnome.members;
62+ license = licenses.lgpl2;
63+ platforms = platforms.linux;
64+ };
65+}
pkgs/top-level/all-packages.nix+2
@@ -181,6 +181,8 @@ in
181181
182182 deadcode = callPackage ../development/tools/deadcode { };
183183
184+ glade = callPackage ../development/tools/glade { };
185+
184186 hobbes = callPackage ../development/tools/hobbes { stdenv = gcc6Stdenv; }; # GCC 6 is latest currently supported. See https://git.io/JvK6M.
185187
186188 proto-contrib = callPackage ../development/tools/proto-contrib {};