commit edcecfee0032110738005e486ff40325e5b08e9e · pyrox.dev/nixpkgs

nixos/modules/module-list.nix

···

       649
       649
        
         ./services/networking/nullidentdmod.nix

     

       650
       650
        
         ./services/networking/nylon.nix

     

       651
       651
        
         ./services/networking/ocserv.nix

     

       652
       652
       +
         ./services/networking/ofono.nix

     

       652
       653
        
         ./services/networking/oidentd.nix

     

       653
       654
        
         ./services/networking/openfire.nix

     

       654
       655
        
         ./services/networking/openntpd.nix

+44

nixos/modules/services/networking/ofono.nix

···

       1
       1
       +
       # Ofono daemon.

     

       2
       2
       +
       { config, lib, pkgs, ... }:

     

       3
       3
       +
       

     

       4
       4
       +
       with lib;

     

       5
       5
       +
       

     

       6
       6
       +
       let

     

       7
       7
       +
       

     

       8
       8
       +
         cfg = config.services.ofono;

     

       9
       9
       +
       

     

       10
       10
       +
         plugin_path =

     

       11
       11
       +
           lib.concatMapStringsSep ":"

     

       12
       12
       +
             (plugin: "${plugin}/lib/ofono/plugins")

     

       13
       13
       +
             cfg.plugins

     

       14
       14
       +
           ;

     

       15
       15
       +
       

     

       16
       16
       +
       in

     

       17
       17
       +
       

     

       18
       18
       +
       {

     

       19
       19
       +
         ###### interface

     

       20
       20
       +
         options = {

     

       21
       21
       +
           services.ofono = {

     

       22
       22
       +
             enable = mkEnableOption "Ofono";

     

       23
       23
       +
       

     

       24
       24
       +
             plugins = mkOption {

     

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

     

       26
       26
       +
               default = [];

     

       27
       27
       +
               example = literalExample "[ pkgs.modem-manager-gui ]";

     

       28
       28
       +
               description = ''

     

       29
       29
       +
                 The list of plugins to install.

     

       30
       30
       +
               '';

     

       31
       31
       +
             };

     

       32
       32
       +
           };

     

       33
       33
       +
         };

     

       34
       34
       +
       

     

       35
       35
       +
         ###### implementation

     

       36
       36
       +
         config = mkIf cfg.enable {

     

       37
       37
       +
           services.dbus.packages = [ pkgs.ofono ];

     

       38
       38
       +
       

     

       39
       39
       +
           systemd.packages = [ pkgs.ofono ];

     

       40
       40
       +
       

     

       41
       41
       +
           systemd.services.ofono.environment.OFONO_PLUGIN_PATH = mkIf (cfg.plugins != []) plugin_path;

     

       42
       42
       +
       

     

       43
       43
       +
         };

     

       44
       44
       +
       }

+18 -5

pkgs/applications/networking/modem-manager-gui/default.nix

···

       1
       1
       -
       { stdenv, pkgconfig, python3, fetchhg, gtk3, glib, gdbm, gtkspell3, itstool, libappindicator-gtk3, perlPackages, glibcLocales, meson, ninja }:

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , pkgconfig

     

       3
       3
       +
       , python3

     

       4
       4
       +
       , fetchhg

     

       5
       5
       +
       , gtk3

     

       6
       6
       +
       , glib

     

       7
       7
       +
       , gdbm

     

       8
       8
       +
       , gtkspell3

     

       9
       9
       +
       , ofono

     

       10
       10
       +
       , itstool

     

       11
       11
       +
       , libappindicator-gtk3

     

       12
       12
       +
       , perlPackages

     

       13
       13
       +
       , glibcLocales

     

       14
       14
       +
       , meson

     

       15
       15
       +
       , ninja

     

       16
       16
       +
       }:

     

       2
       17
        
       

     

       3
       18
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "modem-manager-gui-${version}";

     

       19
       19
       +
         pname = "modem-manager-gui";

     

       5
       20
        
         version = "0.0.19.1";

     

       6
       21
        
       

     

       7
       22
        
         src = fetchhg {

     
···

       9
       24
        
           rev = "version ${version}";

     

       10
       25
        
           sha256 = "11iibh36567814h2bz41sa1072b86p1l13xyj670pwkh9k8kw8fd";

     

       11
       26
        
         };

     

       12
       12
       -
       

     

       13
       13
       -
         LC_ALL = "en_US.utf-8";

     

       14
       27
        
       

     

       15
       28
        
         nativeBuildInputs = [

     

       16
       29
        
           pkgconfig

     

       17
       30
        
           python3

     

       18
       31
        
           perlPackages.Po4a

     

       19
       32
        
           itstool

     

       20
       20
       -
           glibcLocales

     

       21
       33
        
           meson

     

       22
       34
        
           ninja

     

       23
       35
        
         ];

     
···

       27
       39
        
           glib

     

       28
       40
        
           gdbm

     

       29
       41
        
           gtkspell3

     

       42
       42
       +
           ofono

     

       30
       43
        
           libappindicator-gtk3

     

       31
       44
        
         ];

     

       32
       45

+47

pkgs/development/tools/ofono-phonesim/default.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , mkDerivation

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , autoreconfHook

     

       5
       5
       +
       , pkgconfig

     

       6
       6
       +
       , qtbase

     

       7
       7
       +
       , qtscript

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       mkDerivation rec {

     

       11
       11
       +
         pname = "ofono-phonesim";

     

       12
       12
       +
         version = "unstable-2014-04-22";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "jpakkane";

     

       16
       16
       +
           repo = "ofono-phonesim";

     

       17
       17
       +
           rev = "baa41f04e6a86c5289d7185cad8a6f08a5c3ed0a";

     

       18
       18
       +
           sha256 = "0ywalvvf3dfbn81ml21gji1n2hywh2nmakynakjzyyskcqjn2wiz";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         patches = [

     

       22
       22
       +
           ./qt5-compat.patch

     

       23
       23
       +
         ];

     

       24
       24
       +
       

     

       25
       25
       +
         nativeBuildInputs = [

     

       26
       26
       +
           autoreconfHook

     

       27
       27
       +
           pkgconfig

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         buildInputs = [

     

       31
       31
       +
           qtbase

     

       32
       32
       +
           qtscript

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         makeFlags = [

     

       36
       36
       +
           "MOC=${qtbase.dev}/bin/moc"

     

       37
       37
       +
           "UIC=${qtbase.dev}/bin/uic"

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       40
       40
       +
         meta = with stdenv.lib; {

     

       41
       41
       +
           description = "Phone Simulator for modem testing";

     

       42
       42
       +
           homepage = https://github.com/jpakkane/ofono-phonesim;

     

       43
       43
       +
           license = licenses.gpl2;

     

       44
       44
       +
           maintainers = with maintainers; [ jtojnar ];

     

       45
       45
       +
           platforms = platforms.linux;

     

       46
       46
       +
         };

     

       47
       47
       +
       }

+48

pkgs/development/tools/ofono-phonesim/qt5-compat.patch

···

       1
       1
       +
       diff --git a/configure.ac b/configure.ac

     

       2
       2
       +
       index 2436292..993df87 100644

     

       3
       3
       +
       --- a/configure.ac

     

       4
       4
       +
       +++ b/configure.ac

     

       5
       5
       +
       @@ -21,18 +21,18 @@ AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization],

     

       6
       6
       +
        	fi

     

       7
       7
       +
        ])

     

       8
       8
       +
        

     

       9
       9
       +
       -PKG_CHECK_MODULES(QT, QtCore QtGui QtXml QtNetwork QtScript QtDBus, dummy=yes,

     

       10
       10
       +
       +PKG_CHECK_MODULES(QT, Qt5Core Qt5Gui Qt5Widgets Qt5Xml Qt5Network Qt5Script Qt5DBus, dummy=yes,

     

       11
       11
       +
        						AC_MSG_ERROR(Qt is required))

     

       12
       12
       +
        AC_SUBST(QT_CFLAGS)

     

       13
       13
       +
        AC_SUBST(QT_LIBS)

     

       14
       14
       +
        

     

       15
       15
       +
        AC_MSG_CHECKING(for moc)

     

       16
       16
       +
       -MOC="`$PKG_CONFIG --variable=moc_location QtCore`"

     

       17
       17
       +
       +MOC="`$PKG_CONFIG --variable=moc_location Qt5Core`"

     

       18
       18
       +
        AC_SUBST(MOC)

     

       19
       19
       +
        AC_MSG_RESULT($MOC)

     

       20
       20
       +
        

     

       21
       21
       +
        AC_MSG_CHECKING(for uic)

     

       22
       22
       +
       -UIC="`$PKG_CONFIG --variable=uic_location QtCore`"

     

       23
       23
       +
       +UIC="`$PKG_CONFIG --variable=uic_location Qt5Core`"

     

       24
       24
       +
        AC_SUBST(UIC)

     

       25
       25
       +
        AC_MSG_RESULT($UIC)

     

       26
       26
       +
        

     

       27
       27
       +
       diff --git a/src/control.cpp b/src/control.cpp

     

       28
       28
       +
       index e1838a6..880da68 100644

     

       29
       29
       +
       --- a/src/control.cpp

     

       30
       30
       +
       +++ b/src/control.cpp

     

       31
       31
       +
       @@ -22,7 +22,7 @@

     

       32
       32
       +
        #include <qslider.h>

     

       33
       33
       +
        #include <qcheckbox.h>

     

       34
       34
       +
        #include <qcombobox.h>

     

       35
       35
       +
       -#include <QtGui/qmessagebox.h>

     

       36
       36
       +
       +#include <QMessageBox>

     

       37
       37
       +
        #include <qfiledialog.h>

     

       38
       38
       +
        #include <Qt>

     

       39
       39
       +
        #include <qbuffer.h>

     

       40
       40
       +
       @@ -31,7 +31,7 @@

     

       41
       41
       +
        #include <QFileInfo>

     

       42
       42
       +
        #include <QFile>

     

       43
       43
       +
        #include <QDir>

     

       44
       44
       +
       -#include <QtGui/QHeaderView>

     

       45
       45
       +
       +#include <QHeaderView>

     

       46
       46
       +
        

     

       47
       47
       +
        #define TWO_BYTE_MAX 65535

     

       48
       48
       +
        #define FOUR_CHAR 4

+120

pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch

···

       1
       1
       +
       From 0e0994c9716700c9484b3dccb25f98a9a59d1744 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Jan Tojnar <jtojnar@gmail.com>

     

       3
       3
       +
       Date: Fri, 23 Aug 2019 18:42:51 +0200

     

       4
       4
       +
       Subject: [PATCH] Search connectors in OFONO_PLUGIN_PATH

     

       5
       5
       +
       

     

       6
       6
       +
       Previously, the connectors would only be looked for in a single

     

       7
       7
       +
       directory, specified during compilation. This patch allows to

     

       8
       8
       +
       traverse a list of directories provided by an environment variable.

     

       9
       9
       +
       ---

     

       10
       10
       +
        src/plugin.c | 77 ++++++++++++++++++++++++++++++++++------------------

     

       11
       11
       +
        1 file changed, 50 insertions(+), 27 deletions(-)

     

       12
       12
       +
       

     

       13
       13
       +
       diff --git a/src/plugin.c b/src/plugin.c

     

       14
       14
       +
       index 924a45ec..f05055c3 100644

     

       15
       15
       +
       --- a/src/plugin.c

     

       16
       16
       +
       +++ b/src/plugin.c

     

       17
       17
       +
       @@ -99,35 +99,12 @@ static gboolean check_plugin(struct ofono_plugin_desc *desc,

     

       18
       18
       +
        	return TRUE;

     

       19
       19
       +
        }

     

       20
       20
       +
        

     

       21
       21
       +
       -#include "builtin.h"

     

       22
       22
       +
       -

     

       23
       23
       +
       -int __ofono_plugin_init(const char *pattern, const char *exclude)

     

       24
       24
       +
       -{

     

       25
       25
       +
       -	gchar **patterns = NULL;

     

       26
       26
       +
       -	gchar **excludes = NULL;

     

       27
       27
       +
       -	GSList *list;

     

       28
       28
       +
       -	GDir *dir;

     

       29
       29
       +
       +static handle_dir(const gchar *plugin_path, const gchar **patterns, const gchar **excludes) {

     

       30
       30
       +
        	const gchar *file;

     

       31
       31
       +
        	gchar *filename;

     

       32
       32
       +
       -	unsigned int i;

     

       33
       33
       +
       -

     

       34
       34
       +
       -	DBG("");

     

       35
       35
       +
       -

     

       36
       36
       +
       -	if (pattern)

     

       37
       37
       +
       -		patterns = g_strsplit_set(pattern, ":, ", -1);

     

       38
       38
       +
       -

     

       39
       39
       +
       -	if (exclude)

     

       40
       40
       +
       -		excludes = g_strsplit_set(exclude, ":, ", -1);

     

       41
       41
       +
       -

     

       42
       42
       +
       -	for (i = 0; __ofono_builtin[i]; i++) {

     

       43
       43
       +
       -		if (check_plugin(__ofono_builtin[i],

     

       44
       44
       +
       -					patterns, excludes) == FALSE)

     

       45
       45
       +
       -			continue;

     

       46
       46
       +
       -

     

       47
       47
       +
       -		add_plugin(NULL, __ofono_builtin[i]);

     

       48
       48
       +
       -	}

     

       49
       49
       +
       +	GDir *dir;

     

       50
       50
       +
        

     

       51
       51
       +
       -	dir = g_dir_open(PLUGINDIR, 0, NULL);

     

       52
       52
       +
       +	dir = g_dir_open(plugin_path, 0, NULL);

     

       53
       53
       +
        	if (dir != NULL) {

     

       54
       54
       +
        		while ((file = g_dir_read_name(dir)) != NULL) {

     

       55
       55
       +
        			void *handle;

     

       56
       56
       +
       @@ -137,7 +114,7 @@ int __ofono_plugin_init(const char *pattern, const char *exclude)

     

       57
       57
       +
        					g_str_has_suffix(file, ".so") == FALSE)

     

       58
       58
       +
        				continue;

     

       59
       59
       +
        

     

       60
       60
       +
       -			filename = g_build_filename(PLUGINDIR, file, NULL);

     

       61
       61
       +
       +			filename = g_build_filename(plugin_path, file, NULL);

     

       62
       62
       +
        

     

       63
       63
       +
        			handle = dlopen(filename, RTLD_NOW);

     

       64
       64
       +
        			if (handle == NULL) {

     

       65
       65
       +
       @@ -168,6 +145,52 @@ int __ofono_plugin_init(const char *pattern, const char *exclude)

     

       66
       66
       +
        

     

       67
       67
       +
        		g_dir_close(dir);

     

       68
       68
       +
        	}

     

       69
       69
       +
       +}

     

       70
       70
       +
       +

     

       71
       71
       +
       +#include "builtin.h"

     

       72
       72
       +
       +

     

       73
       73
       +
       +int __ofono_plugin_init(const char *pattern, const char *exclude)

     

       74
       74
       +
       +{

     

       75
       75
       +
       +	gchar **patterns = NULL;

     

       76
       76
       +
       +	gchar **excludes = NULL;

     

       77
       77
       +
       +	GSList *list;

     

       78
       78
       +
       +	unsigned int i;

     

       79
       79
       +
       +

     

       80
       80
       +
       +	DBG("");

     

       81
       81
       +
       +

     

       82
       82
       +
       +	if (pattern)

     

       83
       83
       +
       +		patterns = g_strsplit_set(pattern, ":, ", -1);

     

       84
       84
       +
       +

     

       85
       85
       +
       +	if (exclude)

     

       86
       86
       +
       +		excludes = g_strsplit_set(exclude, ":, ", -1);

     

       87
       87
       +
       +

     

       88
       88
       +
       +	for (i = 0; __ofono_builtin[i]; i++) {

     

       89
       89
       +
       +		if (check_plugin(__ofono_builtin[i],

     

       90
       90
       +
       +					patterns, excludes) == FALSE)

     

       91
       91
       +
       +			continue;

     

       92
       92
       +
       +

     

       93
       93
       +
       +		add_plugin(NULL, __ofono_builtin[i]);

     

       94
       94
       +
       +	}

     

       95
       95
       +
       +

     

       96
       96
       +
       +

     

       97
       97
       +
       +	const gchar *plugin_path;

     

       98
       98
       +
       +

     

       99
       99
       +
       +	plugin_path = g_getenv ("OFONO_PLUGIN_PATH");

     

       100
       100
       +
       +

     

       101
       101
       +
       +	if (!plugin_path) {

     

       102
       102
       +
       +		gchar **plugin_path_list;

     

       103
       103
       +
       +		gsize i;

     

       104
       104
       +
       +

     

       105
       105
       +
       +		plugin_path_list = g_strsplit (plugin_path, G_SEARCHPATH_SEPARATOR_S, 0);

     

       106
       106
       +
       +

     

       107
       107
       +
       +		for (i = 0; plugin_path_list[i]; i++) {

     

       108
       108
       +
       +			handle_dir(plugin_path_list, patterns, excludes);

     

       109
       109
       +
       +		}

     

       110
       110
       +
       +

     

       111
       111
       +
       +		g_strfreev(plugin_path_list);

     

       112
       112
       +
       +	}

     

       113
       113
       +
       +

     

       114
       114
       +
       +	handle_dir(PLUGINDIR, patterns, excludes);

     

       115
       115
       +
        

     

       116
       116
       +
        	for (list = plugins; list; list = list->next) {

     

       117
       117
       +
        		struct ofono_plugin *plugin = list->data;

     

       118
       118
       +
       -- 

     

       119
       119
       +
       2.22.0

     

       120
       120
       +

+5 -1

pkgs/tools/networking/ofono/default.nix

···

       22
       22
        
           sha256 = "1qzysmzpgbh6zc3x9xh931wxcazka9wwx727c2k66z9gal2n6n66";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       +
         patches = [

     

       26
       26
       +
           ./0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       25
       29
        
         nativeBuildInputs = [

     

       26
       30
        
           autoreconfHook

     

       27
       31
        
           pkgconfig

     
···

       37
       41
        
         ];

     

       38
       42
        
       

     

       39
       43
        
         configureFlags = [

     

       40
       40
       -
           "--with-dbusconfdir=${placeholder ''out''}/etc/dbus-1/system.d"

     

       44
       44
       +
           "--with-dbusconfdir=${placeholder ''out''}/share"

     

       41
       45
        
           "--with-systemdunitdir=${placeholder ''out''}/lib/systemd/system"

     

       42
       46
        
           "--enable-external-ell"

     

       43
       47
        
         ];

pkgs/top-level/all-packages.nix

···

       5150
       5150
        
       

     

       5151
       5151
        
         offlineimap = callPackage ../tools/networking/offlineimap { };

     

       5152
       5152
        
       

     

       5153
       5153
       +
         ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim/default.nix { };

     

       5154
       5154
       +
       

     

       5153
       5155
        
         oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { };

     

       5154
       5156
        
       

     

       5155
       5157
        
         ola = callPackage ../applications/misc/ola { };