commit 90a7bb69d076292d4955708d6cb29efa8b84951e · pyrox.dev/nixpkgs

+15 -5

nixos/modules/services/networking/bitlbee.nix

···

       16
       16
        
           ''

     

       17
       17
        
           [settings]

     

       18
       18
        
           RunMode = Daemon

     

       19
       19
       -
           User = bitlbee  

     

       19
       19
       +
           User = bitlbee

     

       20
       20
        
           ConfigDir = ${cfg.configDir}

     

       21
       21
        
           DaemonInterface = ${cfg.interface}

     

       22
       22
        
           DaemonPort = ${toString cfg.portNumber}

     

       23
       23
        
           AuthMode = ${cfg.authMode}

     

       24
       24
       +
           Plugindir = ${pkgs.bitlbee-plugins cfg.plugins}/lib/bitlbee

     

       24
       25
        
           ${lib.optionalString (cfg.hostName != "") "HostName = ${cfg.hostName}"}

     

       25
       26
        
           ${lib.optionalString (cfg.protocols != "") "Protocols = ${cfg.protocols}"}

     

       26
       27
        
           ${cfg.extraSettings}

     
···

       72
       73
        
                   Open -- Accept connections from anyone, use NickServ for user authentication.

     

       73
       74
        
                   Closed -- Require authorization (using the PASS command during login) before allowing the user to connect at all.

     

       74
       75
        
                   Registered -- Only allow registered users to use this server; this disables the register- and the account command until the user identifies himself.

     

       75
       75
       -
               ''; 

     

       76
       76
       +
               '';

     

       76
       77
        
             };

     

       77
       78
        
       

     

       78
       79
        
             hostName = mkOption {

     
···

       85
       86
        
               '';

     

       86
       87
        
             };

     

       87
       88
        
       

     

       89
       89
       +
             plugins = mkOption {

     

       90
       90
       +
               type = types.listOf types.package;

     

       91
       91
       +
               default = [];

     

       92
       92
       +
               example = literalExample "[ pkgs.bitlbee-facebook ]";

     

       93
       93
       +
               description = ''

     

       94
       94
       +
                 The list of bitlbee plugins to install.

     

       95
       95
       +
               '';

     

       96
       96
       +
             };

     

       97
       97
       +
       

     

       88
       98
        
             configDir = mkOption {

     

       89
       99
        
               default = "/var/lib/bitlbee";

     

       90
       100
        
               type = types.path;

     
···

       107
       117
        
               default = "";

     

       108
       118
        
               description = ''

     

       109
       119
        
                 Will be inserted in the Settings section of the config file.

     

       110
       110
       -
               ''; 

     

       120
       120
       +
               '';

     

       111
       121
        
             };

     

       112
       122
        
       

     

       113
       123
        
             extraDefaults = mkOption {

     

       114
       124
        
               default = "";

     

       115
       125
        
               description = ''

     

       116
       126
        
                 Will be inserted in the Default section of the config file.

     

       117
       117
       -
               ''; 

     

       127
       127
       +
               '';

     

       118
       128
        
             };

     

       119
       129
        
       

     

       120
       130
        
           };

     
···

       138
       148
        
               gid = config.ids.gids.bitlbee;

     

       139
       149
        
             };

     

       140
       150
        
       

     

       141
       141
       -
           systemd.services.bitlbee = 

     

       151
       151
       +
           systemd.services.bitlbee =

     

       142
       152
        
             { description = "BitlBee IRC to other chat networks gateway";

     

       143
       153
        
               after = [ "network.target" ];

     

       144
       154
        
               wantedBy = [ "multi-user.target" ];

+27

pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix

···

       1
       1
       +
       { fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json_glib }:

     

       2
       2
       +
       

     

       3
       3
       +
       with stdenv.lib;

     

       4
       4
       +
       stdenv.mkDerivation rec {

     

       5
       5
       +
         name = "bitlbee-facebook-2015-08-27";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           rev = "094a11b542e2cd8fac4f00fe01870ecd1cb4c062";

     

       9
       9
       +
           owner = "jgeboski";

     

       10
       10
       +
           repo = "bitlbee-facebook";

     

       11
       11
       +
           sha256 = "1dvbl1z6fl3wswvqbs82vkqlggk24dyi8w7cmm5jh1fmaznmwqrl";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         buildInputs = [ bitlbee autoconf automake libtool pkgconfig glib json_glib ];

     

       15
       15
       +
       

     

       16
       16
       +
         preConfigure = ''

     

       17
       17
       +
           export BITLBEE_PLUGINDIR=$out/lib/bitlbee

     

       18
       18
       +
           ./autogen.sh

     

       19
       19
       +
         '';

     

       20
       20
       +
       

     

       21
       21
       +
         meta = {

     

       22
       22
       +
           description = "The Facebook protocol plugin for bitlbee";

     

       23
       23
       +
       

     

       24
       24
       +
           homepage = https://github.com/jgeboski/bitlbee-facebook;

     

       25
       25
       +
           license = licenses.gpl2Plus;

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+10 -1

pkgs/applications/networking/instant-messengers/bitlbee/default.nix

···

       1
       1
       -
       { fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python }:

     

       1
       1
       +
       { fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python }:

     

       2
       2
        
       

     

       3
       3
        
       with stdenv.lib;

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       12
       12
        
         buildInputs = [ gnutls glib pkgconfig libotr python ]

     

       13
       13
        
           ++ optional doCheck check;

     

       14
       14
        
       

     

       15
       15
       +
         patches = [(fetchpatch {

     

       16
       16
       +
           url = "https://github.com/bitlbee/bitlbee/commit/34d16d5b4b5265990125894572a90493284358cd.patch";

     

       17
       17
       +
           sha256 = "05in9kxabb6s2c1l4b9ry58ppfciwmwzrkaq33df2zv0pr3z7w33";

     

       18
       18
       +
         })];

     

       19
       19
       +
       

     

       15
       20
        
         configureFlags = [

     

       16
       21
        
           "--gcov=1"

     

       17
       22
        
           "--otr=1"

     

       18
       23
        
           "--ssl=gnutls"

     

       19
       24
        
         ];

     

       25
       25
       +
       

     

       26
       26
       +
         buildPhase = ''

     

       27
       27
       +
           make install-dev

     

       28
       28
       +
         '';

     

       20
       29
        
       

     

       21
       30
        
         doCheck = true;

     

       22
       31

+20

pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix

···

       1
       1
       +
       { stdenv, bitlbee }:

     

       2
       2
       +
       

     

       3
       3
       +
       with stdenv.lib;

     

       4
       4
       +
       

     

       5
       5
       +
       plugins:

     

       6
       6
       +
       

     

       7
       7
       +
       stdenv.mkDerivation {

     

       8
       8
       +
         inherit bitlbee plugins;

     

       9
       9
       +
         name = "bitlbee-plugins";

     

       10
       10
       +
         buildInputs = [ bitlbee plugins ];

     

       11
       11
       +
         phases = [ "installPhase" ];

     

       12
       12
       +
         installPhase = ''

     

       13
       13
       +
           mkdir -p $out/lib/bitlbee

     

       14
       14
       +
           for plugin in $plugins; do

     

       15
       15
       +
             for thing in $(ls $plugin/lib/bitlbee); do

     

       16
       16
       +
               ln -s $plugin/lib/bitlbee/$thing $out/lib/bitlbee/

     

       17
       17
       +
             done

     

       18
       18
       +
           done

     

       19
       19
       +
         '';

     

       20
       20
       +
       }

pkgs/top-level/all-packages.nix

···

       10887
       10887
        
         bibletime = callPackage ../applications/misc/bibletime { };

     

       10888
       10888
        
       

     

       10889
       10889
        
         bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };

     

       10890
       10890
       +
         bitlbee-plugins = callPackage ../applications/networking/instant-messengers/bitlbee/plugins.nix { };

     

       10891
       10891
       +
       

     

       10892
       10892
       +
         bitlbee-facebook = callPackage ../applications/networking/instant-messengers/bitlbee-facebook { };

     

       10890
       10893
        
       

     

       10891
       10894
        
         bitmeter = callPackage ../applications/audio/bitmeter { };

     

       10892
       10895