diff --git a/lib/licenses.nix b/lib/licenses.nix index fa710ae4b16d..964c0966e437 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -217,6 +217,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "GNU Free Documentation License v1.3"; }; + ffsl = { + fullName = "Floodgap Free Software License"; + url = http://www.floodgap.com/software/ffsl/license.html; + }; + free = { fullName = "Unspecified free software license"; }; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index f77a26697026..a78539ffb6d3 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -636,6 +636,7 @@ wjlroe = "William Roe "; wkennington = "William A. Kennington III "; wmertens = "Wout Mertens "; + woffs = "Frank Doepper "; womfoo = "Kranium Gikos Mendoza "; wscott = "Wayne Scott "; wyvie = "Elijah Rum "; diff --git a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix new file mode 100644 index 000000000000..c71db351e9d2 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, perl, perlPackages, coreutils, +fetchFromGitHub, makeWrapper }: + +stdenv.mkDerivation rec { + name = "oysttyer-${version}"; + version = "2.9.1"; + + src = fetchFromGitHub { + owner = "oysttyer"; + repo = "oysttyer"; + rev = "${version}"; + sha256 = "05bfak4jr8ln4847rkj5qkazqnjym65k1phav3yicbyr3mxywhjw"; + }; + + buildInputs = [ + perl + makeWrapper + ]; + + propagatedBuildInputs = with perlPackages; [ + DateTimeFormatDateParse + TermReadLineTTYtter + TermReadKey + ]; + + installPhase = '' + ${coreutils}/bin/install -Dm755 \ + oysttyer.pl \ + $out/bin/oysttyer + + wrapProgram $out/bin/oysttyer \ + --prefix PERL5LIB : $PERL5LIB + ''; + + meta = with lib; { + inherit version; + description = "Perl Console Twitter Client"; + homepage = http://oysttyer.github.io/; + maintainers = with maintainers; [ woffs ]; + license = with licenses; [ ffsl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d4b467a3e3e..40339435c35d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4658,6 +4658,8 @@ with pkgs; turses = callPackage ../applications/networking/instant-messengers/turses { }; + oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { }; + twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap/v3.nix {}; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3d8f7622d030..41920f7ccb5a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13059,6 +13059,21 @@ let self = _self // overrides; _self = with self; { }; }; + TermReadLineTTYtter = buildPerlPackage rec { + name = "Term-ReadLine-TTYtter-1.4"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CK/CKAISER/Term-ReadLine-TTYtter-1.4.tar.gz"; + sha256 = "14xcqhg1vrwgv65nd2z8xzn0wgb18i17pzkkh8m15cp1rqrk2dxc"; + }; + + outputs = [ "out" ]; + + meta = { + description = "a modified version of T::RL::Perl with several new nonstandard features specific to TTYtter"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TermShellUI = buildPerlPackage rec { name = "Term-ShellUI-0.92"; src = fetchurl {