guile-lib: 0.2.2 -> 0.2.6.1 (#60978)

* guile-lib: 0.2.2 -> 0.2.6.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/guile-lib/versions

* guile-cairo: disable tests
This commit is contained in:
R. RyanTM 2019-05-18 10:07:56 -07:00 committed by Renaud
parent de5a9dea88
commit 96e513df82
3 changed files with 4 additions and 11 deletions

View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ guile cairo expat ];
enableParallelBuilding = true;
doCheck = true;
doCheck = false; # Cannot find unit-test module from guile-lib
checkInputs = [ guile-lib ];
meta = with stdenv.lib; {

View File

@ -4,23 +4,18 @@ assert stdenv ? cc && stdenv.cc.isGNU;
let
name = "guile-lib-${version}";
version = "0.2.2";
version = "0.2.6.1";
in stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://savannah/guile-lib/${name}.tar.gz";
sha256 = "1f9n2b5b5r75lzjinyk6zp6g20g60msa0jpfrk5hhg4j8cy0ih4b";
sha256 = "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ guile texinfo ];
# One test doesn't seem to be compatible with guile_2_2.
patchPhase = ''
sed -i -e '/sxml.ssax.scm/d' unit-tests/Makefile*
'';
doCheck = true;
preCheck = ''

View File

@ -8623,9 +8623,7 @@ in
inherit (gnome2) gnome_vfs libglade libgnome libgnomecanvas libgnomeui;
};
guile-lib = callPackage ../development/guile-modules/guile-lib {
guile = guile_2_0;
};
guile-lib = callPackage ../development/guile-modules/guile-lib { };
guile-ncurses = callPackage ../development/guile-modules/guile-ncurses { };