From b9f71fe5d3eae72ce07f2c3dca3debeaea7a5f9a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 21 Mar 2022 10:16:41 +0000 Subject: [PATCH] =?UTF-8?q?libgsf:=201.14.48=20=E2=86=92=201.14.49?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libgsf/-/compare/LIBGSF_1_14_48...LIBGSF_1_14_49 Also format the expression. --- pkgs/development/libraries/libgsf/default.nix | 71 ++++++++++++++----- 1 file changed, 52 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 1850da7e646..8bc2dc76160 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,26 +1,59 @@ -{ fetchurl, lib, stdenv, pkg-config, intltool, gettext, glib, libxml2, zlib, bzip2 -, perl, gdk-pixbuf, libiconv, libintl, gnome }: +{ fetchurl +, lib +, stdenv +, pkg-config +, intltool +, gettext +, glib +, libxml2 +, zlib +, bzip2 +, perl +, gdk-pixbuf +, libiconv +, libintl +, gnome +}: stdenv.mkDerivation rec { pname = "libgsf"; - version = "1.14.48"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "/4bX8dRt0Ovvt72DCnSkHbZDYrmHv4hT//arTBEyuDc="; - }; - - nativeBuildInputs = [ pkg-config intltool libintl ]; - - buildInputs = [ gettext bzip2 zlib ]; - checkInputs = [ perl ]; - - propagatedBuildInputs = [ libxml2 glib gdk-pixbuf libiconv ]; + version = "1.14.49"; outputs = [ "out" "dev" ]; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "6evjZojwEMnm5AyJA/NzKUjeuKygMleNB9B1G9gs+Fc="; + }; + + nativeBuildInputs = [ + pkg-config + intltool + libintl + ]; + + buildInputs = [ + gettext + bzip2 + zlib + ]; + + checkInputs = [ + perl + ]; + + propagatedBuildInputs = [ + libxml2 + glib + gdk-pixbuf + libiconv + ]; + doCheck = true; - preCheck = "patchShebangs ./tests/"; + + preCheck = '' + patchShebangs ./tests/ + ''; passthru = { updateScript = gnome.updateScript { @@ -31,10 +64,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNOME's Structured File Library"; - homepage = "https://www.gnome.org/projects/libgsf"; - license = licenses.lgpl2Plus; + homepage = "https://www.gnome.org/projects/libgsf"; + license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; - platforms = lib.platforms.unix; + platforms = lib.platforms.unix; longDescription = '' Libgsf aims to provide an efficient extensible I/O abstraction for