From 6b17638dc6c052a3b2e132959a0f0e2b38f4310c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 15 May 2020 17:29:00 +0200 Subject: [PATCH 1/3] glade: rename from gnome3.glade --- pkgs/applications/editors/gnome-builder/default.nix | 3 ++- pkgs/desktops/gnome-3/default.nix | 4 ++-- pkgs/development/libraries/libhandy/default.nix | 4 ++-- .../gnome-3/apps => development/tools}/glade/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 9 insertions(+), 6 deletions(-) rename pkgs/{desktops/gnome-3/apps => development/tools}/glade/default.nix (97%) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index c58d12a58f8..3db4e5649a5 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -9,6 +9,7 @@ , gnome3 , libgit2-glib , gobject-introspection +, glade , gspell , gtk-doc , gtk3 @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { ctags flatpak gnome3.devhelp - gnome3.glade + glade libgit2-glib libpeas libportal diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 9d34fc0f40c..846eefa9fa9 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -164,8 +164,6 @@ lib.makeScope pkgs.newScope (self: with self; { ghex = callPackage ./apps/ghex { }; - glade = callPackage ./apps/glade { }; - gnome-books = callPackage ./apps/gnome-books { }; gnome-boxes = callPackage ./apps/gnome-boxes { }; @@ -352,6 +350,8 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) networkmanagerapplet; # added 2019-12-12 + inherit (pkgs) glade; # added 2020-05-15 + vino = throw "vino is deprecated, use gnome-remote-desktop instead."; # added 2020-03-13 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 diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 2a5ad06455d..25186abb3aa 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala , gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, gtk3, gnome3 +, gtk3, gnome3, glade , dbus, xvfb_run, libxml2 , hicolor-icon-theme }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meson ninja pkgconfig gobject-introspection vala libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ gnome3.gnome-desktop gtk3 gnome3.glade libxml2 ]; + buildInputs = [ gnome3.gnome-desktop gtk3 glade libxml2 ]; checkInputs = [ dbus xvfb_run hicolor-icon-theme ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/development/tools/glade/default.nix similarity index 97% rename from pkgs/desktops/gnome-3/apps/glade/default.nix rename to pkgs/development/tools/glade/default.nix index 23f5410e1ea..504f781f168 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { packageName = "glade"; attrPath = "gnome3.glade"; }; + updateScript = gnome3.updateScript { packageName = "glade"; }; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0db4b476682..3ca119668f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -181,6 +181,8 @@ in deadcode = callPackage ../development/tools/deadcode { }; + glade = callPackage ../development/tools/glade { }; + hobbes = callPackage ../development/tools/hobbes { stdenv = gcc6Stdenv; }; # GCC 6 is latest currently supported. See https://git.io/JvK6M. proto-contrib = callPackage ../development/tools/proto-contrib {}; From fe7e564467acbc1e8b3009fab41c62c4de9f8a04 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 15 May 2020 17:30:40 +0200 Subject: [PATCH 2/3] glade: format with nixpkgs-fmt also switch away from dependency aliases and reorder the attributes a bit --- pkgs/development/tools/glade/default.nix | 50 ++++++++++++++++++------ 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index 504f781f168..13b3d8c2362 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -1,7 +1,20 @@ -{ stdenv, intltool, fetchurl, python3 -, pkgconfig, gtk3, glib, gobject-introspection -, wrapGAppsHook, itstool, libxml2, docbook_xsl -, gnome3, gdk-pixbuf, libxslt, gsettings-desktop-schemas }: +{ stdenv +, intltool +, fetchurl +, python3 +, pkg-config +, gtk3 +, glib +, gobject-introspection +, wrapGAppsHook +, itstool +, libxml2 +, docbook-xsl-nons +, gnome3 +, gdk-pixbuf +, libxslt +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "glade"; @@ -12,21 +25,36 @@ stdenv.mkDerivation rec { sha256 = "08bayb1rrpblxf6jhhbw2n3c425w170is4l94pampldl4kmsdvzd"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "glade"; }; - }; - nativeBuildInputs = [ - pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt libxml2 gobject-introspection + pkg-config + intltool + itstool + wrapGAppsHook + docbook-xsl-nons + libxslt + libxml2 + gobject-introspection ]; + buildInputs = [ - gtk3 glib libxml2 python3 python3.pkgs.pygobject3 + gtk3 + glib + libxml2 + python3 + python3.pkgs.pygobject3 gsettings-desktop-schemas - gdk-pixbuf gnome3.adwaita-icon-theme + gdk-pixbuf + gnome3.adwaita-icon-theme ]; enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Glade"; description = "User interface designer for GTK applications"; From e20c3296a459b3607de38976e536bac875a5bca7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 15 May 2020 18:29:11 +0200 Subject: [PATCH 3/3] =?UTF-8?q?glade:=203.32.2=20=E2=86=92=203.36.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/glade/3.36/glade-3.36.0.news --- pkgs/development/libraries/libhandy/default.nix | 12 +++++++++++- pkgs/development/tools/glade/default.nix | 8 ++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 25186abb3aa..28816ab1307 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala +{ stdenv, fetchFromGitLab, fetchpatch, meson, ninja, pkgconfig, gobject-introspection, vala , gtk-doc, docbook_xsl, docbook_xml_dtd_43 , gtk3, gnome3, glade , dbus, xvfb_run, libxml2 @@ -20,6 +20,16 @@ stdenv.mkDerivation rec { sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5"; }; + patches = [ + # Fix build with Glade 3.36.0 + # https://source.puri.sm/Librem5/libhandy/merge_requests/451 + (fetchpatch { + url = "https://source.puri.sm/Librem5/libhandy/commit/887beedb467984ab5c7b91830181645fadef7849.patch"; + sha256 = "ZW6qCtHhXMsLsxgcOjVAukgPAhOdvFhxx0iAQEEk8GE="; + excludes = [ "glade/glade-hdy-header-bar.c" ]; + }) + ]; + nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index 13b3d8c2362..4d86fc2acd0 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -1,5 +1,5 @@ { stdenv -, intltool +, gettext , fetchurl , python3 , pkg-config @@ -18,16 +18,16 @@ stdenv.mkDerivation rec { pname = "glade"; - version = "3.22.2"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08bayb1rrpblxf6jhhbw2n3c425w170is4l94pampldl4kmsdvzd"; + sha256 = "GbVGtSfMRiE8z8gCLUnsV+YY/iyqmqUdstKGIjPqbwg="; }; nativeBuildInputs = [ pkg-config - intltool + gettext itstool wrapGAppsHook docbook-xsl-nons