Unverified Commit 22c5e1a0 authored by Gabriel Arazas's avatar Gabriel Arazas Committed by GitHub
Browse files

guile-ssh: clean up the package (#256541) 



* guile-ssh: add foo-dogsquared as maintainer

* guile-ssh: reformat buildInputs

* guile-ssh: add patch for installing module

It makes for an easier time configuring the module installation.

* guile-ssh: remove extension patches

nixpkgs have properly initialized search paths for Guile extensions now
(at least for Guile 3.0.6 and above) so no need to patch the scheme.

* guile-ssh: enable checks

---------

Co-authored-by: default avatarWeijia Wang <9713184+wegank@users.noreply.github.com>
parent f88d0820

pkgs/development/guile-modules/guile-ssh/default.nix

+29 −14
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, fetchpatch

, guile

, libssh

, autoreconfHook
@@ -9,43 +10,57 @@ 
, which

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "guile-ssh";

  version = "0.16.3";



  src = fetchFromGitHub {

    owner = "artyom-poptsov";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-P29U88QrCjoyl/wdTPZbiMoykd/v6ul6CW/IJn9UAyw=";

    repo = "guile-ssh";

    rev = "v${finalAttrs.version}";

    hash = "sha256-P29U88QrCjoyl/wdTPZbiMoykd/v6ul6CW/IJn9UAyw=";

  };



  configureFlags = [ "--with-guilesitedir=\${out}/${guile.siteDir}" ];

  patches = [

    (fetchpatch {

      url = "https://github.com/artyom-poptsov/guile-ssh/pull/31/commits/38636c978f257d5228cd065837becabf5da16854.patch";

      hash = "sha256-J+TDgdjihKoEjhbeH+BzqrHhjpVlGdscRj3L/GAFgKg=";

    })

  ];



  postFixup = ''

    for f in $out/${guile.siteDir}/ssh/**.scm; do \

      substituteInPlace $f \

        --replace "libguile-ssh" "$out/lib/libguile-ssh"; \

    done

  '';

  strictDeps = true;



  nativeBuildInputs = [

    autoreconfHook pkg-config texinfo which

    autoreconfHook

    guile

    pkg-config

    texinfo

    which

  ];



  buildInputs = [

    guile

  ];



  propagatedBuildInputs = [

    libssh

  ];



  enableParallelBuilding = true;



  # FAIL: server-client.scm

  doCheck = !stdenv.isDarwin;



  postInstall = ''

    mv $out/bin/*.scm $out/share/guile-ssh

    rmdir $out/bin

  '';



  meta = with lib; {

    description = "Bindings to Libssh for GNU Guile";

    homepage = "https://github.com/artyom-poptsov/guile-ssh";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ ethancedwards8 ];

    maintainers = with maintainers; [ ethancedwards8 foo-dogsquared ];

    platforms = guile.meta.platforms;

  };

}
 
})