diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2021-02-26 10:25:13 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2021-02-26 10:25:13 +0100 |
commit | c456a2512f7a7558cbe25328a423762033822cc0 (patch) | |
tree | d64f521751037012a1c4d05fedeb485eeee39b05 /pkgs/servers/xmpp | |
parent | babf9d6100c3e5dcdbbbe8850de99d3fe2b3cf86 (diff) | |
parent | 6d7128414cf2763ab14f31365c21c6cec3547dac (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/xmpp')
-rw-r--r-- | pkgs/servers/xmpp/biboumi/default.nix | 9 | ||||
-rw-r--r-- | pkgs/servers/xmpp/pyIRCt/default.nix | 41 | ||||
-rw-r--r-- | pkgs/servers/xmpp/pyMAILt/default.nix | 39 |
3 files changed, 5 insertions, 84 deletions
diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix index 762154f018c87..74d8d9ae52082 100644 --- a/pkgs/servers/xmpp/biboumi/default.nix +++ b/pkgs/servers/xmpp/biboumi/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn, - libiconv, botan2, systemd, pkg-config, udns, pandoc, coreutils } : + libiconv, botan2, systemd, pkg-config, udns, coreutils, python3Packages } : stdenv.mkDerivation rec { pname = "biboumi"; - version = "8.5"; + version = "9.0"; src = fetchurl { url = "https://git.louiz.org/biboumi/snapshot/biboumi-${version}.tar.xz"; - sha256 = "0rn9p99iqdyvxjzjq9w0ra7pkk0mngjy65nlg3hqfdw8kq9mv5qf"; + sha256 = "1jvygri165aknmvlinx3jb8cclny6cxdykjf8dp0a3l3228rmzqy"; }; louiz_catch = fetchgit { @@ -18,9 +18,10 @@ stdenv.mkDerivation rec { patches = [ ./catch.patch ]; - nativeBuildInputs = [ cmake pkg-config pandoc ]; + nativeBuildInputs = [ cmake pkg-config python3Packages.sphinx ]; buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd udns ]; + buildFlags = [ "all" "man" ]; preConfigure = '' substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix deleted file mode 100644 index ebb817f1645ce..0000000000000 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages, runtimeShell } : - -stdenv.mkDerivation rec { - pname = "pyIRCt"; - version = "0.4"; - - src = fetchurl { - url = "mirror://sourceforge/xmpppy/irc-transport-${version}.tar.gz"; - sha256 = "0gbc0dvj1p3088b6x315yjrlwnc5vvzp0var36wlf9z60ghvk8yb"; - }; - - buildInputs = [ pythonPackages.wrapPython ]; - - pythonPath = [ - xmpppy pythonIRClib - ]; - - # phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)]; - - installPhase = '' - mkdir -p $out/bin $out/share/${pname}-${version} - sed -e 's@/usr/bin/@${python}/bin/@' -i irc.py - sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py - sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-irc-transport.xml"]' -i config.py - sed -e '/configFiles/iimport os' -i config.py - cp * $out/share/${pname}-${version} - cat > $out/bin/pyIRCt <<EOF - #!${runtimeShell} - cd $out/share/${pname}-${version} - ./irc.py \"$@\" - EOF - chmod a+rx $out/bin/pyIRCt $out/share/${pname}-${version}/irc.py - wrapPythonPrograms - ''; - - meta = with lib; { - description = "IRC transport module for XMPP"; - platforms = platforms.unix; - license = licenses.gpl2; - }; -} diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix deleted file mode 100644 index 03ded7a5d5cde..0000000000000 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, python, xmpppy, pythonPackages, fetchcvs, runtimeShell } : - -stdenv.mkDerivation rec { - pname = "pyMAILt"; - version = "20090101"; - - src = fetchcvs { - cvsRoot = ":pserver:anonymous@xmpppy.cvs.sourceforge.net:/cvsroot/xmpppy"; - module = "xmpppy/mail-transport"; - date = "2009-01-01"; - sha256 = "15301252e52b4ccb2156baefed8982a2a0cce3ae8eae3caf3cc28dfa615c8d6e"; - }; - - pythonPath = [ xmpppy ]; - buildInputs = [ pythonPackages.wrapPython ]; - - installPhase = '' - cd mail-transport - mkdir -p $out/bin $out/share/${pname}-${version} - sed -e 's@/usr/bin/@${python}/bin/@' -i mail.py - sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyMAILt.xml"]' -i config.py - sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-mail-transport.xml"]' -i config.py - sed -e '/configFiles/iimport os' -i config.py - cp * $out/share/$name - cat > $out/bin/pyMAILt <<EOF - #!${runtimeShell} - cd $out/share/${pname}-${version} - ./mail.py \"$@\" - EOF - chmod a+rx $out/bin/pyMAILt $out/share/${pname}-${version}/mail.py - wrapPythonPrograms - ''; - - meta = with lib; { - description = "Email transport module for XMPP"; - platforms = platforms.unix; - license = licenses.gpl2; - }; -} |