public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #29850 from vyp/fix/guile-lint

Browse Source 
guile-lint: fix build by building with guile 1.8
This commit is contained in:
Orivej Desh 2017-09-28 11:54:32 +00:00 committed by GitHub
commit f86e253b28
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/development/tools/guile/guile-lint/default.nix
View File

@ -1,27 +1,30 @@
{stdenv, fetchurl, guile}: { stdenv, fetchurl, guile }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "guile-lint-14"; name = "guile-lint-${version}";
version = "14";
src = fetchurl { src = fetchurl {
url = "http://download.tuxfamily.org/user42/" + name + ".tar.bz2"; url = "https://download.tuxfamily.org/user42/${name}.tar.bz2";
sha256 = "5bfcf7a623338b2ef81ac097e3e136eaf32856dd0730b7eeaff3161067b5d0be"; sha256 = "1gnhnmki05pkmzpbfc07vmb2iwza6vhy75y03bw2x2rk4fkggz2v";
}; };
buildInputs = [ guile ]; buildInputs = [ guile ];
unpackPhase = ''tar xjvf "$src" && sourceRoot="$PWD/${name}"''; unpackPhase = ''tar xjvf "$src" && sourceRoot="$PWD/${name}"'';
patchPhase = ''
cat guile-lint.in | \ prePatch = ''
sed 's|^exec guile|exec $\{GUILE:-${guile}/bin/guile}|g' > ,,tmp && \ substituteInPlace guile-lint.in --replace \
mv ,,tmp guile-lint.in "exec guile" "exec ${guile}/bin/guile"
''; '';
doCheck = true; doCheck = true;
meta = { meta = with stdenv.lib; {
description = "Guile-Lint checks syntax and semantics in a Guile program or module"; description = "Checks syntax and semantics in a Guile program or module";
homepage = http://user42.tuxfamily.org/guile-lint/index.html; homepage = "https://user42.tuxfamily.org/guile-lint/index.html";
license = "GPL"; license = licenses.gpl3Plus;
broken = true; maintainers = with maintainers; [ vyp ];
platforms = platforms.all;
}; };
} }

1
pkgs/top-level/aliases.nix
View File

@ -69,6 +69,7 @@ mapAliases (rec {
guileCairo = guile-cairo; # added 2017-09-24 guileCairo = guile-cairo; # added 2017-09-24
guileGnome = guile-gnome; # added 2017-09-24 guileGnome = guile-gnome; # added 2017-09-24
guile_lib = guile-lib; # added 2017-09-24 guile_lib = guile-lib; # added 2017-09-24
guileLint = guile-lint; # added 2017-09-27
guile_ncurses = guile-ncurses; # added 2017-09-24 guile_ncurses = guile-ncurses; # added 2017-09-24
gupnptools = gupnp-tools; # added 2015-12-19 gupnptools = gupnp-tools; # added 2015-12-19
gnustep-make = gnustep.make; # added 2016-7-6 gnustep-make = gnustep.make; # added 2016-7-6

4
pkgs/top-level/all-packages.nix
View File

@ -7189,7 +7189,9 @@ with pkgs;
gtkdialog = callPackage ../development/tools/misc/gtkdialog { }; gtkdialog = callPackage ../development/tools/misc/gtkdialog { };
guileLint = callPackage ../development/tools/guile/guile-lint { }; guile-lint = callPackage ../development/tools/guile/guile-lint {
guile = guile_1_8;
};
gwrap = callPackage ../development/tools/guile/g-wrap { }; gwrap = callPackage ../development/tools/guile/g-wrap { };