about summary refs log tree commit diff
path: root/nixpkgs/pkgs/tools/networking/connman
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/tools/networking/connman')
-rw-r--r--nixpkgs/pkgs/tools/networking/connman/connman-gtk/default.nix43
-rw-r--r--nixpkgs/pkgs/tools/networking/connman/connman-ncurses/default.nix41
-rw-r--r--nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix36
-rw-r--r--nixpkgs/pkgs/tools/networking/connman/connman/create-libppp-compat.h.patch132
-rw-r--r--nixpkgs/pkgs/tools/networking/connman/connman/default.nix190
-rw-r--r--nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix35
-rw-r--r--nixpkgs/pkgs/tools/networking/connman/default.nix49
7 files changed, 0 insertions, 526 deletions
diff --git a/nixpkgs/pkgs/tools/networking/connman/connman-gtk/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman-gtk/default.nix
deleted file mode 100644
index c75254a27b15..000000000000
--- a/nixpkgs/pkgs/tools/networking/connman/connman-gtk/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, intltool, pkg-config,
-gtk3, connman, openconnect, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  pname = "connman-gtk";
-  version = "1.1.1";
-
-  src = fetchFromGitHub {
-    owner = "jgke";
-    repo = "connman-gtk";
-    rev = "v${version}";
-    sha256 = "09k0hx5hxpbykvslv12l2fq9pxdwpd311mxj038hbqzjghcyidyr";
-  };
-
-  nativeBuildInputs = [
-    autoconf
-    automake
-    intltool
-    pkg-config
-    wrapGAppsHook
-  ];
-
-  buildInputs = [
-    gtk3
-    openconnect
-    connman
-  ];
-
-  preConfigure = ''
-    # m4/intltool.m4 is an invalid symbolic link
-    rm m4/intltool.m4
-    ln -s ${intltool}/share/aclocal/intltool.m4 m4/
-    ./autogen.sh
-  '';
-
-  meta = with lib; {
-    description = "GTK GUI for Connman";
-    homepage = "https://github.com/jgke/connman-gtk";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.romildo ];
-  };
-}
diff --git a/nixpkgs/pkgs/tools/networking/connman/connman-ncurses/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman-ncurses/default.nix
deleted file mode 100644
index 9d638c48000a..000000000000
--- a/nixpkgs/pkgs/tools/networking/connman/connman-ncurses/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib, stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, pkg-config, dbus, json_c, ncurses, connman }:
-
-stdenv.mkDerivation {
-  pname = "connman-ncurses";
-  version = "2015-07-21";
-
-  src = fetchFromGitHub {
-    owner = "eurogiciel-oss";
-    repo = "connman-json-client";
-    rev = "3c34b2ee62d2e188090d20e7ed2fd94bab9c47f2";
-    sha256 = "1831r0776fv481g8kgy1dkl750pzv47835dw11sslq2k6mm6i9p1";
-  };
-
-  patches = [
-    # Fix build with json-c 0.14
-    (fetchpatch {
-      url = "https://github.com/void-linux/void-packages/raw/5830ce60e922b7dced8157ededda8c995adb3bb9/srcpkgs/connman-ncurses/patches/lowercase-boolean.patch";
-      extraPrefix = "";
-      sha256 = "uK83DeRyXS2Y0ZZpTYvYNh/1ZM2QQ7QpajiBztaEuSM=";
-    })
-  ];
-
-  nativeBuildInputs = [ autoreconfHook pkg-config ];
-
-  buildInputs = [ dbus ncurses json_c connman ];
-
-  env.NIX_CFLAGS_COMPILE = "-Wno-error";
-
-  installPhase = ''
-    mkdir -p "$out/bin"
-    cp -va connman_ncurses "$out/bin/"
-  '';
-
-  meta = with lib; {
-    description = "Simple ncurses UI for connman";
-    homepage = "https://github.com/eurogiciel-oss/connman-json-client";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.romildo ];
-  };
-}
diff --git a/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix
deleted file mode 100644
index cbf500913038..000000000000
--- a/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, fetchFromGitLab, python3Packages, glib, gobject-introspection, wrapGAppsHook }:
-
-python3Packages.buildPythonApplication {
-  pname = "connman-notify";
-  version = "2019-10-05";
-
-  src = fetchFromGitLab {
-    owner = "wavexx";
-    repo = "connman-notify";
-    rev = "24b10a51721b54d932f4cd61ef2756423768c015";
-    sha256 = "1k5b5y6114yna2cm0cq82xilicran63hrhlklgv7k3p89057xh8j";
-  };
-
-  format = "other";
-
-  nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
-
-  buildInputs = [ glib ];
-
-  pythonPath = with python3Packages; [ dbus-python pygobject3 ];
-
-  strictDeps = false;
-
-  installPhase = ''
-    install -D -t $out/bin connman-notify
-    install -D -t $out/share/doc README.rst
-  '';
-
-  meta = with lib; {
-    description = "Desktop notification integration for connman";
-    homepage = "https://gitlab.com/wavexx/connman-notify";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.romildo ];
-  };
-}
diff --git a/nixpkgs/pkgs/tools/networking/connman/connman/create-libppp-compat.h.patch b/nixpkgs/pkgs/tools/networking/connman/connman/create-libppp-compat.h.patch
deleted file mode 100644
index dde8a174ca2a..000000000000
--- a/nixpkgs/pkgs/tools/networking/connman/connman/create-libppp-compat.h.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-new file mode 100644
-index 000000000..eee1d09d6
---- /dev/null
-+++ b/scripts/libppp-compat.h
-@@ -0,0 +1,127 @@
-+/* Copyright (C) Eivind Naess, eivnaes@yahoo.com */
-+/* SPDX-License-Identifier: GPL-2.0-or-later */
-+
-+#ifndef __LIBPPP_COMPAT_H__
-+#define __LIBPPP_COMPAT_H__
-+
-+/* Define USE_EAPTLS compile with EAP TLS support against older pppd headers,
-+ * pppd >= 2.5.0 use PPP_WITH_EAPTLS and is defined in pppdconf.h */
-+#define USE_EAPTLS 1
-+
-+/* Define INET6 to compile with IPv6 support against older pppd headers,
-+ * pppd >= 2.5.0 use PPP_WITH_IPV6CP and is defined in pppdconf.h */
-+#define INET6 1
-+
-+/* PPP < 2.5.0 defines and exports VERSION which overlaps with current package VERSION define.
-+ * this silly macro magic is to work around that. */
-+#undef VERSION
-+#include <pppd/pppd.h>
-+
-+#ifndef PPPD_VERSION
-+#define PPPD_VERSION VERSION
-+#endif
-+
-+#include <pppd/fsm.h>
-+#include <pppd/ccp.h>
-+#include <pppd/eui64.h>
-+#include <pppd/ipcp.h>
-+#include <pppd/ipv6cp.h>
-+#include <pppd/eap.h>
-+#include <pppd/upap.h>
-+
-+#ifdef HAVE_PPPD_CHAP_H
-+#include <pppd/chap.h>
-+#endif
-+
-+#ifdef HAVE_PPPD_CHAP_NEW_H
-+#include <pppd/chap-new.h>
-+#endif
-+
-+#ifdef HAVE_PPPD_CHAP_MS_H
-+#include <pppd/chap_ms.h>
-+#endif
-+
-+#ifndef PPP_PROTO_CHAP
-+#define PPP_PROTO_CHAP 0xc223
-+#endif 
-+
-+#ifndef PPP_PROTO_EAP
-+#define PPP_PROTO_EAP  0xc227
-+#endif
-+
-+
-+#if WITH_PPP_VERSION < PPP_VERSION(2,5,0)
-+
-+static inline bool
-+debug_on (void)
-+{
-+	return debug;
-+}
-+
-+static inline const char
-+*ppp_ipparam (void)
-+{
-+	return ipparam;
-+}
-+
-+static inline int
-+ppp_ifunit (void)
-+{
-+	return ifunit;
-+}
-+
-+static inline const char *
-+ppp_ifname (void)
-+{
-+	return ifname;
-+}
-+
-+static inline int
-+ppp_get_mtu (int idx)
-+{
-+	return netif_get_mtu(idx);
-+}
-+
-+typedef enum ppp_notify
-+{
-+    NF_PID_CHANGE,
-+    NF_PHASE_CHANGE,
-+    NF_EXIT,
-+    NF_SIGNALED,
-+    NF_IP_UP,
-+    NF_IP_DOWN,
-+    NF_IPV6_UP,
-+    NF_IPV6_DOWN,
-+    NF_AUTH_UP,
-+    NF_LINK_DOWN,
-+    NF_FORK,
-+    NF_MAX_NOTIFY
-+} ppp_notify_t;
-+
-+typedef void (ppp_notify_fn) (void *ctx, int arg);
-+
-+static inline void
-+ppp_add_notify (ppp_notify_t type, ppp_notify_fn *func, void *ctx)
-+{
-+	struct notifier **list[NF_MAX_NOTIFY] = {
-+		[NF_PID_CHANGE  ] = &pidchange,
-+		[NF_PHASE_CHANGE] = &phasechange,
-+		[NF_EXIT        ] = &exitnotify,
-+		[NF_SIGNALED    ] = &sigreceived,
-+		[NF_IP_UP       ] = &ip_up_notifier,
-+		[NF_IP_DOWN     ] = &ip_down_notifier,
-+		[NF_IPV6_UP     ] = &ipv6_up_notifier,
-+		[NF_IPV6_DOWN   ] = &ipv6_down_notifier,
-+		[NF_AUTH_UP     ] = &auth_up_notifier,
-+		[NF_LINK_DOWN   ] = &link_down_notifier,
-+		[NF_FORK        ] = &fork_notifier,
-+	};
-+
-+	struct notifier **notify = list[type];
-+	if (notify) {
-+		add_notifier(notify, func, ctx);
-+	}
-+}
-+
-+#endif /* #if WITH_PPP_VERSION < PPP_VERSION(2,5,0) */
-+#endif /* #if__LIBPPP_COMPAT_H__ */
diff --git a/nixpkgs/pkgs/tools/networking/connman/connman/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman/default.nix
deleted file mode 100644
index 7697a8efad89..000000000000
--- a/nixpkgs/pkgs/tools/networking/connman/connman/default.nix
+++ /dev/null
@@ -1,190 +0,0 @@
-{ lib
-, nixosTests
-, stdenv
-, fetchurl
-, fetchpatch
-, pkg-config
-, autoreconfHook
-, file
-, glib
-# always required runtime dependencies
-, dbus
-, libmnl
-, gnutls
-, readline
-# configurable options
-, firewallType ? "iptables" # or "nftables"
-, iptables ? null
-, libnftnl ? null # for nftables
-, dnsType ? "internal" # or "systemd-resolved"
-# optional features which are turned *on* by default
-, enableOpenconnect ? true
-, openconnect ? null
-, enableOpenvpn ? true
-, openvpn ? null
-, enableVpnc ? true
-, vpnc ? true
-, enablePolkit ? true
-, polkit ? null
-, enablePptp ? true
-, pptp ? null
-, ppp ? null
-, enableLoopback ? true
-, enableEthernet ? true
-, enableWireguard ? true
-, enableGadget ? true
-, enableWifi ? true
-, enableBluetooth ? true
-, enableOfono ? true
-, enableDundee ? true
-, enablePacrunner ? true
-, enableNeard ? true
-, enableWispr ? true
-, enableTools ? true
-, enableStats ? true
-, enableClient ? true
-, enableDatafiles ? true
-# optional features which are turned *off* by default
-, enableNetworkManager ? false
-, enableHh2serialGps ? false
-, enableL2tp ? false
-, enableIospm ? false
-, enableTist ? false
-}:
-
-assert lib.asserts.assertOneOf "firewallType" firewallType [ "iptables" "nftables" ];
-assert lib.asserts.assertOneOf "dnsType" dnsType [ "internal" "systemd-resolved" ];
-
-let inherit (lib) optionals; in
-
-stdenv.mkDerivation rec {
-  pname = "connman";
-  version = "1.42";
-  src = fetchurl {
-    url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz";
-    hash = "sha256-o+a65G/Age8una48qk92Sd6JLD3mIsICg6wMqBQjwqo=";
-  };
-
-  patches = [
-    # simply the middle section of upstream commit a48864a2e5d2a725dfc6eef567108bc13b43857f
-    # dist tarball is broken, hence this patch as a workaround
-    ./create-libppp-compat.h.patch
-  ] ++ optionals stdenv.hostPlatform.isMusl [
-    # Fix Musl build by avoiding a Glibc-only API.
-    (fetchurl {
-      url = "https://git.alpinelinux.org/aports/plain/community/connman/libresolv.patch?id=e393ea84386878cbde3cccadd36a30396e357d1e";
-      hash = "sha256-7Q1bp8rD/gGVYUqnIXqjr9vypR8jlC926p3KYWl9kLw=";
-    })
-  ];
-
-  buildInputs = [
-    glib
-    dbus
-    libmnl
-    gnutls
-    readline
-  ] ++ optionals (enableOpenconnect) [ openconnect ]
-    ++ optionals (firewallType == "iptables") [ iptables ]
-    ++ optionals (firewallType == "nftables") [ libnftnl ]
-    ++ optionals (enablePolkit) [ polkit ]
-    ++ optionals (enablePptp) [ pptp ppp ]
-  ;
-
-  nativeBuildInputs = [
-    pkg-config
-    file
-    autoreconfHook  # as long as we're patching configure.ac
-  ];
-
-  # fix invalid path to 'file'
-  postPatch = ''
-    sed -i "s/\/usr\/bin\/file/file/g" ./configure
-  '';
-
-  configureFlags = [
-    # directories flags
-    "--sysconfdir=/etc"
-    "--localstatedir=/var"
-    "--with-dbusconfdir=${placeholder "out"}/share"
-    "--with-dbusdatadir=${placeholder "out"}/share"
-    "--with-tmpfilesdir=${placeholder "out"}/lib/tmpfiles.d"
-    "--with-systemdunitdir=${placeholder "out"}/lib/systemd/system"
-    "--with-dns-backend=${dnsType}"
-    "--with-firewall=${firewallType}"
-    # production build flags
-    "--disable-maintainer-mode"
-    "--enable-session-policy-local=builtin"
-    # for building and running tests
-    # "--enable-tests" # installs the tests, we don't want that
-    "--enable-tools"
-  ]
-    ++ optionals (!enableLoopback) [ "--disable-loopback" ]
-    ++ optionals (!enableEthernet) [ "--disable-ethernet" ]
-    ++ optionals (!enableWireguard) [ "--disable-wireguard" ]
-    ++ optionals (!enableGadget) [ "--disable-gadget" ]
-    ++ optionals (!enableWifi) [ "--disable-wifi" ]
-    # enable IWD support for wifi as it doesn't require any new dependencies
-    # and it's easier for the NixOS module to use only one connman package when
-    # IWD is requested
-    ++ optionals (enableWifi) [ "--enable-iwd" ]
-    ++ optionals (!enableBluetooth) [ "--disable-bluetooth" ]
-    ++ optionals (!enableOfono) [ "--disable-ofono" ]
-    ++ optionals (!enableDundee) [ "--disable-dundee" ]
-    ++ optionals (!enablePacrunner) [ "--disable-pacrunner" ]
-    ++ optionals (!enableNeard) [ "--disable-neard" ]
-    ++ optionals (!enableWispr) [ "--disable-wispr" ]
-    ++ optionals (!enableTools) [ "--disable-tools" ]
-    ++ optionals (!enableStats) [ "--disable-stats" ]
-    ++ optionals (!enableClient) [ "--disable-client" ]
-    ++ optionals (!enableDatafiles) [ "--disable-datafiles" ]
-    ++ optionals (enableOpenconnect) [
-      "--enable-openconnect=builtin"
-      "--with-openconnect=${openconnect}/sbin/openconnect"
-    ]
-    ++ optionals (enableOpenvpn) [
-      "--enable-openvpn=builtin"
-      "--with-openvpn=${openvpn}/sbin/openvpn"
-    ]
-    ++ optionals (enableVpnc) [
-      "--enable-vpnc=builtin"
-      "--with-vpnc=${vpnc}/sbin/vpnc"
-    ]
-    ++ optionals (enablePolkit) [
-      "--enable-polkit"
-    ]
-    ++ optionals (enablePptp) [
-      "--enable-pptp"
-      "--with-pptp=${pptp}/sbin/pptp"
-    ]
-    ++ optionals (!enableWireguard) [
-      "--disable-wireguard"
-    ]
-    ++ optionals (enableNetworkManager) [
-      "--enable-nmcompat"
-    ]
-    ++ optionals (enableHh2serialGps) [
-      "--enable-hh2serial-gps"
-    ]
-    ++ optionals (enableL2tp) [
-      "--enable-l2tp"
-    ]
-    ++ optionals (enableIospm) [
-      "--enable-iospm"
-    ]
-    ++ optionals (enableTist) [
-      "--enable-tist"
-    ]
-  ;
-
-  doCheck = true;
-
-  passthru.tests.connman = nixosTests.connman;
-
-  meta = with lib; {
-    description = "A daemon for managing internet connections";
-    homepage = "https://git.kernel.org/pub/scm/network/connman/connman.git/";
-    maintainers = with maintainers; [ eclairevoyant ];
-    platforms = platforms.linux;
-    license = licenses.gpl2Only;
-  };
-}
diff --git a/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix
deleted file mode 100644
index 86e5a62fb8de..000000000000
--- a/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, connman, dmenu }:
-
-stdenv.mkDerivation {
-  pname = "connman_dmenu";
-  version = "unstable-2015-09-29";
-
-  src = fetchFromGitHub {
-    owner = "march-linux";
-    repo = "connman_dmenu";
-    rev = "cc89fec40b574b0d234afeb70ea3c94626ca3f5c";
-    sha256 = "061fi83pai4n19l9d7wq6wwj2d7cixwkhkh742c5ibmw1wb274yk";
-  };
-
-  buildInputs = [ connman dmenu ];
-
-  dontBuild = true;
-
-  # remove root requirement, see: https://github.com/march-linux/connman_dmenu/issues/3
-  postPatch = ''
-    sed -i '89,92d' connman_dmenu
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp connman_dmenu $out/bin/
-  '';
-
-  meta = {
-    description = "A dmenu wrapper for connmann";
-    homepage = "https://github.com/march-linux/connman_dmenu";
-    license = lib.licenses.free;
-    maintainers = [ lib.maintainers.magnetophon ];
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/nixpkgs/pkgs/tools/networking/connman/default.nix b/nixpkgs/pkgs/tools/networking/connman/default.nix
deleted file mode 100644
index 4cc9e5e2b318..000000000000
--- a/nixpkgs/pkgs/tools/networking/connman/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ lib, pkgs }:
-
-lib.makeScope pkgs.newScope (self: with self; {
-
-  # All the defaults
-  connman = callPackage ./connman { };
-
-  connmanFull = connman.override {
-    # TODO: Why is this in `connmanFull` and not the default build? See TODO in
-    # nixos/modules/services/networking/connman.nix (near the assertions)
-    enableNetworkManager = true;
-    enableHh2serialGps = true;
-    enableL2tp = true;
-    enableIospm = true;
-    enableTist = true;
-  };
-
-  connmanMinimal = connman.override {
-    enableOpenconnect = false;
-    enableOpenvpn = false;
-    enableVpnc = false;
-    vpnc = false;
-    enablePolkit = false;
-    enablePptp = false;
-    enableLoopback = false;
-    # enableEthernet = false; # If disabled no ethernet connection can be performed
-    enableWireguard = false;
-    enableGadget = false;
-    # enableWifi = false; # If disabled no WiFi connection can be performed
-    enableBluetooth = false;
-    enableOfono = false;
-    enableDundee = false;
-    enablePacrunner = false;
-    enableNeard = false;
-    enableWispr = false;
-    enableTools = false;
-    enableStats = false;
-    enableClient = false;
-    # enableDatafiles = false; # If disabled, configuration and data files are not installed
-  };
-
-  connman_dmenu = callPackage ./connman_dmenu { };
-
-  connman-gtk = callPackage ./connman-gtk { };
-
-  connman-ncurses = callPackage ./connman-ncurses { };
-
-  connman-notify = callPackage ./connman-notify { };
-})