Merge pull request #111650 from fabaff/license-autossh

autossh: add license

authored by Martin Weinelt and committed by GitHub 6c6aec24 e9876afb

+10 -4
+5
lib/licenses.nix
··· 100 fullName = "BSD Zero Clause License"; 101 }; 102 103 bsd2 = spdx { 104 spdxId = "BSD-2-Clause"; 105 fullName = ''BSD 2-clause "Simplified" License'';
··· 100 fullName = "BSD Zero Clause License"; 101 }; 102 103 + bsd1 = spdx { 104 + spdxId = "BSD-1-Clause"; 105 + fullName = "BSD 1-Clause License"; 106 + }; 107 + 108 bsd2 = spdx { 109 spdxId = "BSD-2-Clause"; 110 fullName = ''BSD 2-clause "Simplified" License'';
+5 -4
pkgs/tools/networking/autossh/default.nix
··· 1 {lib, stdenv, fetchurl, openssh}: 2 3 stdenv.mkDerivation rec { 4 - name = "autossh-1.4g"; 5 6 src = fetchurl { 7 - url = "http://www.harding.motd.ca/autossh/${name}.tgz"; 8 sha256 = "0xqjw8df68f4kzkns5gcah61s5wk0m44qdk2z1d6388w6viwxhsz"; 9 }; 10 ··· 15 16 nativeBuildInputs = [ openssh ]; 17 18 - installPhase = 19 - '' 20 install -D -m755 autossh $out/bin/autossh || return 1 21 install -D -m644 CHANGES $out/share/doc/autossh/CHANGES || return 1 22 install -D -m644 README $out/share/doc/autossh/README || return 1 ··· 28 meta = with lib; { 29 homepage = "https://www.harding.motd.ca/autossh/"; 30 description = "Automatically restart SSH sessions and tunnels"; 31 platforms = platforms.unix; 32 maintainers = with maintainers; [ pSub ]; 33 };
··· 1 {lib, stdenv, fetchurl, openssh}: 2 3 stdenv.mkDerivation rec { 4 + pname = "autossh"; 5 + version = "1.4g"; 6 7 src = fetchurl { 8 + url = "http://www.harding.motd.ca/autossh/${pname}-${version}.tgz"; 9 sha256 = "0xqjw8df68f4kzkns5gcah61s5wk0m44qdk2z1d6388w6viwxhsz"; 10 }; 11 ··· 16 17 nativeBuildInputs = [ openssh ]; 18 19 + installPhase = '' 20 install -D -m755 autossh $out/bin/autossh || return 1 21 install -D -m644 CHANGES $out/share/doc/autossh/CHANGES || return 1 22 install -D -m644 README $out/share/doc/autossh/README || return 1 ··· 28 meta = with lib; { 29 homepage = "https://www.harding.motd.ca/autossh/"; 30 description = "Automatically restart SSH sessions and tunnels"; 31 + license = licenses.bsd1; 32 platforms = platforms.unix; 33 maintainers = with maintainers; [ pSub ]; 34 };