From 03c5c0a2c47261383efe01acd09f4bd7cfc02b08 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 11 Feb 2023 10:56:58 -0500 Subject: [PATCH] gtksourceview: Add `meta.pkgConfigModules` and test --- .../gnome-2/desktop/gtksourceview/default.nix | 20 ++++++++++++++----- .../libraries/gtksourceview/3.x.nix | 17 +++++++++++----- .../libraries/gtksourceview/4.x.nix | 12 ++++++++--- .../libraries/gtksourceview/5.x.nix | 12 ++++++++--- 4 files changed, 45 insertions(+), 16 deletions(-) diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index df63449c2f6..9db253dab3a 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -1,15 +1,19 @@ {lib, stdenv, fetchpatch, fetchurl, autoreconfHook, pkg-config, atk, cairo, glib , gnome-common, gtk2, pango -, libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2 }: +, libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2 +, testers +}: with lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; version = "2.10.5"; - src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/2.10/${pname}-${version}.tar.bz2"; + src = let + inherit (finalAttrs) pname version; + in fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e"; }; @@ -40,4 +44,10 @@ stdenv.mkDerivation rec { ''; doCheck = false; # requires X11 daemon -} + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = { + pkgConfigModules = [ "gtksourceview-2.0" ]; + }; +}) diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index 447e7d061fd..704a7c3e9c5 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -1,12 +1,16 @@ { lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, vala -, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb-run, shared-mime-info }: +, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb-run, shared-mime-info +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; version = "3.24.11"; - src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + src = let + inherit (finalAttrs) pname version; + in fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1zbpj283b5ycz767hqz5kdq02wzsga65pp4fykvhg8xj6x50f6v9"; }; @@ -42,10 +46,13 @@ stdenv.mkDerivation rec { make check ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; + pkgConfigModules = [ "gtksourceview-3.0" ]; platforms = with platforms; linux ++ darwin; license = licenses.lgpl21; maintainers = teams.gnome.members; }; -} +}) diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 95e6e8d2e10..e824e1ed9c6 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -19,15 +19,18 @@ , dbus , xvfb-run , shared-mime-info +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; version = "4.8.4"; outputs = [ "out" "dev" ]; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "fsnRj7KD0fhKOj7/O3pysJoQycAGWXs/uru1lYQgqH0="; }; @@ -101,11 +104,14 @@ stdenv.mkDerivation rec { }; }; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Source code editing widget for GTK"; homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; + pkgConfigModules = [ "gtksourceview-4" ]; platforms = platforms.unix; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; }; -} +}) diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index 849c3caf267..100e3e44a88 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -20,15 +20,18 @@ , dbus , xvfb-run , shared-mime-info +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; version = "5.6.2"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "HxRsFW8TWmBJnZeeNXfJm24VoRFEV2er5iGbs0xUXHc="; }; @@ -117,11 +120,14 @@ stdenv.mkDerivation rec { }; }; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Source code editing widget for GTK"; homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; + pkgConfigModules = [ "gtksourceview-5" ]; platforms = platforms.unix; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; }; -} +})