diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-09-28 11:54:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 11:54:32 +0000 |
| commit | f86e253b280f2d0ab995378de37960a8c372b469 (patch) | |
| tree | 61ca813093ad63af900674a71e54a76c4d4a184a | |
| parent | 15189140dd22f7e7f55800fc70451b4e31103e87 (diff) | |
| parent | 262b1cb40147a97e431c84994382a8b03741cece (diff) | |
| download | nixpkgs-f86e253b280f2d0ab995378de37960a8c372b469.tar nixpkgs-f86e253b280f2d0ab995378de37960a8c372b469.tar.gz nixpkgs-f86e253b280f2d0ab995378de37960a8c372b469.tar.bz2 nixpkgs-f86e253b280f2d0ab995378de37960a8c372b469.tar.lz nixpkgs-f86e253b280f2d0ab995378de37960a8c372b469.tar.xz nixpkgs-f86e253b280f2d0ab995378de37960a8c372b469.tar.zst nixpkgs-f86e253b280f2d0ab995378de37960a8c372b469.zip | |
Merge pull request #29850 from vyp/fix/guile-lint
guile-lint: fix build by building with guile 1.8
| -rw-r--r-- | pkgs/development/tools/guile/guile-lint/default.nix | 29 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 20 insertions, 14 deletions
diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 7ca54365be5..19441c54017 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -1,27 +1,30 @@ -{stdenv, fetchurl, guile}: +{ stdenv, fetchurl, guile }: stdenv.mkDerivation rec { - name = "guile-lint-14"; + name = "guile-lint-${version}"; + version = "14"; + src = fetchurl { - url = "http://download.tuxfamily.org/user42/" + name + ".tar.bz2"; - sha256 = "5bfcf7a623338b2ef81ac097e3e136eaf32856dd0730b7eeaff3161067b5d0be"; + url = "https://download.tuxfamily.org/user42/${name}.tar.bz2"; + sha256 = "1gnhnmki05pkmzpbfc07vmb2iwza6vhy75y03bw2x2rk4fkggz2v"; }; buildInputs = [ guile ]; unpackPhase = ''tar xjvf "$src" && sourceRoot="$PWD/${name}"''; - patchPhase = '' - cat guile-lint.in | \ - sed 's|^exec guile|exec $\{GUILE:-${guile}/bin/guile}|g' > ,,tmp && \ - mv ,,tmp guile-lint.in + + prePatch = '' + substituteInPlace guile-lint.in --replace \ + "exec guile" "exec ${guile}/bin/guile" ''; doCheck = true; - meta = { - description = "Guile-Lint checks syntax and semantics in a Guile program or module"; - homepage = http://user42.tuxfamily.org/guile-lint/index.html; - license = "GPL"; - broken = true; + meta = with stdenv.lib; { + description = "Checks syntax and semantics in a Guile program or module"; + homepage = "https://user42.tuxfamily.org/guile-lint/index.html"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ vyp ]; + platforms = platforms.all; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4fafdfb726c..343e10f55be 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -69,6 +69,7 @@ mapAliases (rec { guileCairo = guile-cairo; # added 2017-09-24 guileGnome = guile-gnome; # 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 gupnptools = gupnp-tools; # added 2015-12-19 gnustep-make = gnustep.make; # added 2016-7-6 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0670b372d4..5ccda31fb5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7189,7 +7189,9 @@ with pkgs; 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 { }; |