Unverified Commit d35c19ca authored by Stig's avatar Stig Committed by GitHub
Browse files

Merge pull request #262104 from zakame/contrib/convos-7.16 

convos: 7.02 -> 8.05
parents 82e1ad99 2d6897ad

nixos/tests/convos.nix

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ in 
  testScript = ''

    machine.wait_for_unit("convos")

    machine.wait_for_open_port(${toString port})

    machine.succeed("journalctl -u convos | grep -q 'application available at.*${toString port}'")

    machine.succeed("curl -f http://localhost:${toString port}/")

  '';

})

pkgs/applications/networking/irc/convos/default.nix

+9 −7
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ 


perlPackages.buildPerlPackage rec {

  pname = "convos";

  version = "7.02";

  version = "8.05";



  src = fetchFromGitHub {

    owner = "convos-chat";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-i8lDK5/Whi5uo2/Qqh5jgJGLuuHn7kdrfvr+9Ktzp/8=";

    sha256 = "sha256-dBvXo8y4OMKcb0imgnnzoklnPN3YePHDvy5rIBOkTfs=";

  };



  nativeBuildInputs = [ makeWrapper ]
@@ -20,9 +20,8 @@ perlPackages.buildPerlPackage rec { 
    CryptPassphrase CryptPassphraseArgon2 CryptPassphraseBcrypt

    FileHomeDir FileReadBackwards HTTPAcceptLanguage SyntaxKeywordTry FutureAsyncAwait

    IOSocketSSL IRCUtils JSONValidator LinkEmbedder ModuleInstall

    Mojolicious MojoliciousPluginOpenAPI MojoliciousPluginSyslog MojoliciousPluginWebpack

    ParseIRC TextMarkdownHoedown TimePiece UnicodeUTF8

    CpanelJSONXS EV

    Mojolicious MojoliciousPluginOpenAPI MojoliciousPluginSyslog ParseIRC

    TextMarkdownHoedown TimePiece UnicodeUTF8 CpanelJSONXS EV YAMLLibYAML

  ];



  propagatedBuildInputs = [ openssl ];
@@ -48,6 +47,9 @@ perlPackages.buildPerlPackage rec { 
    substituteInPlace t/web-register-open-to-public.t \

      --replace '!127.0.0.1!' '!localhost!'



    # Another online test fails, so remove this.

    rm t/irc-reconnect.t



    # A webirc test fails to resolve "localhost" likely due to sandboxing, we

    # remove this test.

    #
@@ -74,9 +76,9 @@ perlPackages.buildPerlPackage rec { 
    AUTO_SHARE_PATH=$out/${perl.libPrefix}/auto/share/dist/Convos

    mkdir -p $AUTO_SHARE_PATH

    cp -vR public assets $AUTO_SHARE_PATH/

    ln -s $AUTO_SHARE_PATH/public/asset $out/asset

    ln -s $AUTO_SHARE_PATH/public/assets $out/assets

    cp -vR templates $out/templates

    cp cpanfile $out/cpanfile

    cp Makefile.PL $out/Makefile.PL

  '' + lib.optionalString stdenv.isDarwin ''

    shortenPerlShebang $out/bin/convos

  '' + ''

pkgs/top-level/perl-packages.nix

+3 −3
Original line number Diff line number Diff line
@@ -16581,10 +16581,10 @@ with self; { 














  Mojolicious = buildPerlPackage {















    pname = "Mojolicious";













    version = "9.34";













    version = "9.35";















    src = fetchurl {













      url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.34.tar.gz";













      hash = "sha256-UGnWjk4titZj21iFm0/sDOeasTTZ5YBVqq8/DzpzosY=";













      url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.35.tar.gz";













      hash = "sha256-akpEbuB/ynxtty9dgXVA1oMwCcuN58zkxvskoV7n1Gs=";















    };















    meta = {















      description = "Real-time web framework";