diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gtksourceview')
3 files changed, 56 insertions, 25 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix b/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix index dce589dd6474..704a7c3e9c54 100644 --- a/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/nixpkgs/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"; }; @@ -21,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool perl gobject-introspection vala ]; - checkInputs = [ xvfb-run dbus ]; + nativeCheckInputs = [ xvfb-run dbus ]; buildInputs = [ atk cairo glib pango libxml2 gettext ]; @@ -38,14 +42,17 @@ stdenv.mkDerivation rec { NO_AT_BRIDGE=1 \ XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ 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/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix b/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix index 74acd6f743d6..e824e1ed9c67 100644 --- a/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix @@ -19,17 +19,20 @@ , dbus , xvfb-run , shared-mime-info +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; - version = "4.8.3"; + 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 = "wwAZUGMgyiR02DTM7R4iF+pTPgDrKj9Ot4eQB5QOxoI="; + sha256 = "fsnRj7KD0fhKOj7/O3pysJoQycAGWXs/uru1lYQgqH0="; }; patches = [ @@ -65,19 +68,28 @@ stdenv.mkDerivation rec { shared-mime-info ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run dbus ]; - doCheck = stdenv.isLinux; + postPatch = '' + # https://gitlab.gnome.org/GNOME/gtksourceview/-/merge_requests/295 + # build: drop unnecessary vapigen check + substituteInPlace meson.build \ + --replace "if generate_vapi" "if false" + ''; + + # Broken by PCRE 2 bump in GLib. + # https://gitlab.gnome.org/GNOME/gtksourceview/-/issues/283 + doCheck = false; checkPhase = '' runHook preCheck XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --no-rebuild --print-errorlogs runHook postCheck @@ -92,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/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix b/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix index 307fb15e98d8..ae0a640234cb 100644 --- a/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix @@ -19,17 +19,20 @@ , dbus , xvfb-run , shared-mime-info +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; - version = "5.4.2"; + version = "5.8.0"; 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 = "rRQOB+uEGRDeSDwJK9SIWr0puq3W6V+iLZPtLfC3nec="; + sha256 = "EQ3Uwg3vIYhvv3dymP4O+Mwq1gI7jzbHQkQRpBSBiTM="; }; patches = [ @@ -48,6 +51,7 @@ stdenv.mkDerivation rec { gobject-introspection vala gi-docgen + gtk4 # for gtk4-update-icon-cache checked during configure ]; buildInputs = [ @@ -65,7 +69,7 @@ stdenv.mkDerivation rec { shared-mime-info ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run dbus ]; @@ -79,10 +83,12 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck - XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ - xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - meson test --no-rebuild --print-errorlogs + env \ + XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ + GTK_A11Y=none \ + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus}/share/dbus-1/session.conf \ + meson test --no-rebuild --print-errorlogs runHook postCheck ''; @@ -100,11 +106,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; }; -} +}) |