ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 08:59:32 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #111650 from fabaff/license-autossh

Browse Source 
autossh: add license
This commit is contained in:
Martin Weinelt 2021-02-02 20:01:51 +01:00 committed by GitHub
commit 6c6aec24c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/licenses.nix
View File

@ -100,6 +100,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
fullName = "BSD Zero Clause License"; fullName = "BSD Zero Clause License";
}; };
bsd1 = spdx {
spdxId = "BSD-1-Clause";
fullName = "BSD 1-Clause License";
};
bsd2 = spdx { bsd2 = spdx {
spdxId = "BSD-2-Clause"; spdxId = "BSD-2-Clause";
fullName = ''BSD 2-clause "Simplified" License''; fullName = ''BSD 2-clause "Simplified" License'';

9
pkgs/tools/networking/autossh/default.nix
View File

@ -1,10 +1,11 @@
{lib, stdenv, fetchurl, openssh}: {lib, stdenv, fetchurl, openssh}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "autossh-1.4g"; pname = "autossh";
version = "1.4g";
src = fetchurl { src = fetchurl {
url = "http://www.harding.motd.ca/autossh/${name}.tgz"; url = "http://www.harding.motd.ca/autossh/${pname}-${version}.tgz";
sha256 = "0xqjw8df68f4kzkns5gcah61s5wk0m44qdk2z1d6388w6viwxhsz"; sha256 = "0xqjw8df68f4kzkns5gcah61s5wk0m44qdk2z1d6388w6viwxhsz";
}; };
@ -15,8 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ openssh ]; nativeBuildInputs = [ openssh ];
installPhase = installPhase = ''
''
install -D -m755 autossh $out/bin/autossh || return 1 install -D -m755 autossh $out/bin/autossh || return 1
install -D -m644 CHANGES $out/share/doc/autossh/CHANGES || return 1 install -D -m644 CHANGES $out/share/doc/autossh/CHANGES || return 1
install -D -m644 README $out/share/doc/autossh/README || return 1 install -D -m644 README $out/share/doc/autossh/README || return 1
@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
homepage = "https://www.harding.motd.ca/autossh/"; homepage = "https://www.harding.motd.ca/autossh/";
description = "Automatically restart SSH sessions and tunnels"; description = "Automatically restart SSH sessions and tunnels";
license = licenses.bsd1;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ pSub ]; maintainers = with maintainers; [ pSub ];
}; };