Unverified Commit 6c6aec24 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #111650 from fabaff/license-autossh 

autossh: add license
parents e9876afb 27f33459

lib/licenses.nix

+5 −0
Original line number Diff line number Diff line
@@ -100,6 +100,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { 
    fullName = "BSD Zero Clause License";

  };



  bsd1 = spdx {

    spdxId = "BSD-1-Clause";

    fullName = "BSD 1-Clause License";

  };



  bsd2 = spdx {

    spdxId = "BSD-2-Clause";

    fullName = ''BSD 2-clause "Simplified" License'';

pkgs/tools/networking/autossh/default.nix

+5 −4
Original line number Diff line number Diff line 
{lib, stdenv, fetchurl, openssh}:



stdenv.mkDerivation rec {

  name = "autossh-1.4g";

  pname = "autossh";

  version = "1.4g";



  src = fetchurl {

    url = "http://www.harding.motd.ca/autossh/${name}.tgz";

    url = "http://www.harding.motd.ca/autossh/${pname}-${version}.tgz";

    sha256 = "0xqjw8df68f4kzkns5gcah61s5wk0m44qdk2z1d6388w6viwxhsz";

  };
@@ -15,8 +16,7 @@ stdenv.mkDerivation rec { 


  nativeBuildInputs = [ openssh ];



  installPhase =

    ''

  installPhase = ''

      install -D -m755 autossh      $out/bin/autossh                          || return 1

      install -D -m644 CHANGES      $out/share/doc/autossh/CHANGES            || return 1

      install -D -m644 README       $out/share/doc/autossh/README             || return 1
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec { 
  meta = with lib; {

    homepage = "https://www.harding.motd.ca/autossh/";

    description = "Automatically restart SSH sessions and tunnels";

    license = licenses.bsd1;

    platforms = platforms.unix;

    maintainers = with maintainers; [ pSub ];

  };