commit 38d6aec3f630b4ef012f902482ef0ad5a5170844 · pyrox.dev/nixpkgs

+4 -27

pkgs/tools/networking/network-manager-applet/default.nix

···

       1
       1
        
       { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3

     

       2
       2
       -
       , libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring 

     

       2
       2
       +
       , libnotify, libsecret, dbus_glib, polkit, isocodes

     

       3
       3
        
       , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas

     

       4
       4
       -
       , makeWrapper, networkmanager_openvpn, networkmanager_vpnc

     

       5
       5
       -
       , networkmanager_openconnect, networkmanager_pptp, networkmanager_l2tp

     

       6
       6
       -
       , udev, hicolor_icon_theme, dconf }:

     

       4
       4
       +
       , makeWrapper, udev, hicolor_icon_theme, dconf }:

     

       7
       5
        
       

     

       8
       6
        
       let

     

       9
       7
        
         pn = "network-manager-applet";

     

       10
       10
       -
         major = "0.9";

     

       8
       8
       +
         major = "1.0";

     

       11
       9
        
         version = networkmanager.version;

     

       12
       10
        
       in

     

       13
       11
        
       

     
···

       16
       14
        
       

     

       17
       15
        
         src = fetchurl {

     

       18
       16
        
           url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz";

     

       19
       19
       -
           sha256 = "1jz0vawfixzm892m6plrzhsybgdxwv96pfwld9p85lb7wshykzj6";

     

       17
       17
       +
           sha256 = "0liia390bhkl09lvk2rplcwhmfbxpjffa1xszfawc0h00v9fivaz";

     

       20
       18
        
         };

     

       21
       19
        
       

     

       22
       20
        
         buildInputs = [

     
···

       31
       29
        
         makeFlags = [

     

       32
       30
        
           ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''

     

       33
       31
        
         ];

     

       34
       34
       -
       

     

       35
       35
       -
         postInstall = ''

     

       36
       36
       -
           mkdir -p $out/etc/NetworkManager/VPN

     

       37
       37
       -
           ln -s ${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name $out/etc/NetworkManager/VPN/nm-openvpn-service.name

     

       38
       38
       -
           ln -s ${networkmanager_vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name $out/etc/NetworkManager/VPN/nm-vpnc-service.name

     

       39
       39
       -
           ln -s ${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name $out/etc/NetworkManager/VPN/nm-openconnect-service.name

     

       40
       40
       -
           ln -s ${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name $out/etc/NetworkManager/VPN/nm-pptp-service.name

     

       41
       41
       -
           ln -s ${networkmanager_l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name $out/etc/NetworkManager/VPN/nm-l2tp-service.name

     

       42
       42
       -
           mkdir -p $out/lib/NetworkManager

     

       43
       43
       -
           ln -s ${networkmanager_openvpn}/lib/NetworkManager/* $out/lib/NetworkManager/

     

       44
       44
       -
           ln -s ${networkmanager_vpnc}/lib/NetworkManager/* $out/lib/NetworkManager/

     

       45
       45
       -
           ln -s ${networkmanager_openconnect}/lib/NetworkManager/* $out/lib/NetworkManager/

     

       46
       46
       -
           ln -s ${networkmanager_pptp}/lib/NetworkManager/* $out/lib/NetworkManager/

     

       47
       47
       -
           ln -s ${networkmanager_l2tp}/lib/NetworkManager/* $out/lib/NetworkManager/

     

       48
       48
       -
           mkdir -p $out/libexec

     

       49
       49
       -
           ln -s ${networkmanager_openvpn}/libexec/* $out/libexec/

     

       50
       50
       -
           ln -s ${networkmanager_vpnc}/libexec/* $out/libexec/

     

       51
       51
       -
           ln -s ${networkmanager_openconnect}/libexec/* $out/libexec/

     

       52
       52
       -
           ln -s ${networkmanager_pptp}/libexec/* $out/libexec/

     

       53
       53
       -
           ln -s ${networkmanager_l2tp}/libexec/* $out/libexec/

     

       54
       54
       -
         '';

     

       55
       32
        
       

     

       56
       33
        
         preFixup = ''

     

       57
       34
        
           wrapProgram "$out/bin/nm-applet" \

+14 -19

pkgs/tools/networking/network-manager/default.nix

···

       1
       1
        
       { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz

     

       2
       2
        
       , udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables

     

       3
       3
       -
       , libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll

     

       4
       4
       -
       , gobjectIntrospection, modemmanager, openresolv }:

     

       3
       3
       +
       , libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline

     

       4
       4
       +
       , gobjectIntrospection, modemmanager, openresolv, libndp }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         name = "network-manager-${version}";

     

       8
       8
       -
         version = "0.9.8.10";

     

       8
       8
       +
         version = "1.0.0";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
       -
           url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz";

     

       12
       12
       -
           sha256 = "0wn9qh8r56r8l19dqr68pdl1rv3zg1dv47rfy6fqa91q7li2fk86";

     

       11
       11
       +
           url = "mirror://gnome/sources/NetworkManager/1.0/NetworkManager-${version}.tar.xz";

     

       12
       12
       +
           sha256 = "0isrv1875whysnrf3fd1cz96xwd54nvj1rijk3fmx5qccznayris";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         preConfigure = ''

     

       16
       16
        
           substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl

     

       17
       17
       +
           substituteInPlace src/ppp-manager/nm-ppp-manager.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe

     

       18
       18
       +
           substituteInPlace src/devices/nm-device.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe

     

       19
       19
       +
           configureFlags="$configureFlags --with-udev-dir=$out/lib/udev"

     

       17
       20
        
         '';

     

       18
       21
        
       

     

       19
       22
        
         # Right now we hardcode quite a few paths at build time. Probably we should

     
···

       21
       24
        
         # remove unneeded build-time dependencies.

     

       22
       25
        
         configureFlags = [

     

       23
       26
        
           "--with-distro=exherbo"

     

       24
       24
       -
           "--with-dhclient=${dhcp}/sbin/dhclient"

     

       27
       27
       +
           "--with-dhclient=${dhcp}/bin/dhclient"

     

       25
       28
        
           # Upstream prefers dhclient, so don't add dhcpcd to the closure

     

       26
       29
        
           #"--with-dhcpcd=${dhcpcd}/sbin/dhcpcd"

     

       27
       30
        
           "--with-dhcpcd=no"

     

       28
       28
       -
           "--with-iptables=${iptables}/sbin/iptables"

     

       29
       29
       -
           "--with-udev-dir=\${out}/lib/udev"

     

       31
       31
       +
           "--with-pppd=${ppp}/bin/pppd"

     

       32
       32
       +
           "--with-iptables=${iptables}/bin/iptables"

     

       33
       33
       +
           #"--with-udev-dir=$(out)/lib/udev"

     

       30
       34
        
           "--with-resolvconf=${openresolv}/sbin/resolvconf"

     

       31
       35
        
           "--sysconfdir=/etc" "--localstatedir=/var"

     

       32
       36
        
           "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d"

     
···

       37
       41
        
           "--with-modem-manager-1"

     

       38
       42
        
         ];

     

       39
       43
        
       

     

       40
       40
       -
         buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz bluez5 gobjectIntrospection modemmanager ];

     

       44
       44
       +
         buildInputs = [ wirelesstools udev libnl libuuid polkit ppp libndp

     

       45
       45
       +
                         xz bluez5 gobjectIntrospection modemmanager readline ];

     

       41
       46
        
       

     

       42
       47
        
         propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ];

     

       43
       48
        
       

     

       44
       49
        
         nativeBuildInputs = [ intltool pkgconfig ];

     

       45
       50
        
       

     

       46
       46
       -
         patches =

     

       47
       47
       -
           [ ( substituteAll {

     

       48
       48
       -
               src = ./nixos-purity.patch;

     

       49
       49
       -
               inherit avahi dnsmasq ppp bind;

     

       50
       50
       -
               glibc = stdenv.cc.libc;

     

       51
       51
       -
             })

     

       52
       52
       -
             ./libnl-3.2.25.patch

     

       53
       53
       -
           ];

     

       54
       54
       -
       

     

       55
       51
        
         preInstall =

     

       56
       52
        
           ''

     

       57
       53
        
             installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" )

     
···

       66
       62
        
       

     

       67
       63
        
             # rename to network-manager to be in style

     

       68
       64
        
             mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service 

     

       69
       69
       -
             echo "Alias=NetworkManager.service" >> $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service

     

       70
       65
        
       

     

       71
       66
        
             # systemd in NixOS doesn't use `systemctl enable`, so we need to establish

     

       72
       67
        
             # aliases ourselves.

-61

pkgs/tools/networking/network-manager/libnl-3.2.25.patch

···

       1
       1
       -
       diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c

     

       2
       2
       -
       index ba8053e..5ac39d3 100644

     

       3
       3
       -
       --- a/src/nm-netlink-monitor.c

     

       4
       4
       -
       +++ b/src/nm-netlink-monitor.c

     

       5
       5
       -
       @@ -177,40 +177,15 @@ link_msg_handler (struct nl_object *obj, void *arg)

     

       6
       6
       -
        static int

     

       7
       7
       -
        event_msg_recv (struct nl_msg *msg, void *arg)

     

       8
       8
       -
        {

     

       9
       9
       -
       -	struct nl_sock *nlh = arg;

     

       10
       10
       -
       -	struct nlmsghdr *hdr = nlmsg_hdr (msg);

     

       11
       11
       -
        	struct ucred *creds = nlmsg_get_creds (msg);

     

       12
       12
       -
       -	const struct sockaddr_nl *snl;

     

       13
       13
       -
       -	guint32 local_port;

     

       14
       14
       -
       -	gboolean accept_msg = FALSE;

     

       15
       15
       -
       -

     

       16
       16
       -
       -	/* Only messages sent from the kernel */

     

       17
       17
       -
       -	if (!creds || creds->uid != 0) {

     

       18
       18
       -
       -		nm_log_dbg (LOGD_HW, "ignoring netlink message from UID %d",

     

       19
       19
       -
       -		            creds ? creds->uid : -1);

     

       20
       20
       -
       -		return NL_SKIP;

     

       21
       21
       -
       -	}

     

       22
       22
       -
       -

     

       23
       23
       -
       -	snl = nlmsg_get_src (msg);

     

       24
       24
       -
       -	g_assert (snl);

     

       25
       25
       -
       -

     

       26
       26
       -
       -	/* Accept any messages from the kernel */

     

       27
       27
       -
       -	if (hdr->nlmsg_pid == 0 || snl->nl_pid == 0)

     

       28
       28
       -
       -		accept_msg = TRUE;

     

       29
       29
       -
        

     

       30
       30
       -
       -	/* And any multicast message directed to our netlink PID, since multicast

     

       31
       31
       -
       -	 * currently requires CAP_ADMIN to use.

     

       32
       32
       -
       -	 */

     

       33
       33
       -
       -	local_port = nl_socket_get_local_port (nlh);

     

       34
       34
       -
       -	if ((hdr->nlmsg_pid == local_port) && snl->nl_groups)

     

       35
       35
       -
       -		accept_msg = TRUE;

     

       36
       36
       -
       -

     

       37
       37
       -
       -	if (accept_msg == FALSE) {

     

       38
       38
       -
       -		nm_log_dbg (LOGD_HW, "ignoring netlink message from PID %d (local PID %d, multicast %d)",

     

       39
       39
       -
       -		            hdr->nlmsg_pid,

     

       40
       40
       -
       -		            local_port,

     

       41
       41
       -
       -		            (hdr->nlmsg_flags & NLM_F_MULTI));

     

       42
       42
       -
       -		return NL_SKIP;

     

       43
       43
       -
       +	if (!creds || creds->pid || creds->uid || creds->gid) {

     

       44
       44
       -
       +		if (creds)

     

       45
       45
       -
       +			nm_log_dbg (LOGD_HW, "netlink: received non-kernel message (pid %d uid %d gid %d)",

     

       46
       46
       -
       +			            creds->pid, creds->uid, creds->gid);

     

       47
       47
       -
       +		else

     

       48
       48
       -
       +			nm_log_dbg (LOGD_HW, "netlink: received message without credentials");

     

       49
       49
       -
       +		return NL_STOP;

     

       50
       50
       -
        	}

     

       51
       51
       -
        

     

       52
       52
       -
        	return NL_OK;

     

       53
       53
       -
       @@ -285,7 +260,7 @@ nlh_setup (struct nl_sock *nlh,

     

       54
       54
       -
        {

     

       55
       55
       -
        	int err;

     

       56
       56
       -
        

     

       57
       57
       -
       -	nl_socket_modify_cb (nlh, NL_CB_MSG_IN, NL_CB_CUSTOM, event_msg_recv, cb_data);

     

       58
       58
       -
       +	nl_socket_modify_cb (nlh, NL_CB_MSG_IN, NL_CB_CUSTOM, event_msg_recv, NULL);

     

       59
       59
       -
        

     

       60
       60
       -
        	if (valid_func)

     

       61
       61
       -
        		nl_socket_modify_cb (nlh, NL_CB_VALID, NL_CB_CUSTOM, valid_func, cb_data);

+5 -5

pkgs/tools/networking/network-manager/openconnect.nix

···

       1
       1
       -
       { stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager

     

       1
       1
       +
       { stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager, libsecret

     

       2
       2
        
       , withGnome ? true, gnome3, procps, module_init_tools }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "${pname}${if withGnome then "-gnome" else ""}-${version}";

     

       6
       6
        
         pname = "NetworkManager-openconnect";

     

       7
       7
       -
         version = "0.9.8.4";

     

       7
       7
       +
         version = networkmanager.version;

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
       -
           url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";

     

       11
       11
       -
           sha256 = "1dl7wcmibrzf9qnpchgk9fxfhw0j2hzzzqmylkm2c41iv81xrd4r";

     

       10
       10
       +
           url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz";

     

       11
       11
       +
           sha256 = "0przs8hzvb6wrf4gc0p9063x67qp9503396aknqq5f79xzw25wq6";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ openconnect networkmanager ]

     

       14
       14
       +
         buildInputs = [ openconnect networkmanager libsecret ]

     

       15
       15
        
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring gnome3.gconf ];

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ intltool pkgconfig ];

+8 -6

pkgs/tools/networking/network-manager/openvpn.nix

···

       1
       1
       -
       { stdenv, fetchurl, openvpn, intltool, pkgconfig, networkmanager

     

       1
       1
       +
       { stdenv, fetchurl, openvpn, intltool, pkgconfig, networkmanager, libsecret

     

       2
       2
        
       , withGnome ? true, gnome3, procps, module_init_tools }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "${pname}${if withGnome then "-gnome" else ""}-${version}";

     

       6
       6
        
         pname = "NetworkManager-openvpn";

     

       7
       7
       -
         version = "0.9.8.4";

     

       7
       7
       +
         version = networkmanager.version;

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
       -
           url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";

     

       11
       11
       -
           sha256 = "11v63s1f3bsa7pmkvr7x65rsigh48wfqzsnixrwc3wqslsv5535g";

     

       10
       10
       +
           url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz";

     

       11
       11
       +
           sha256 = "1w0v3xah0wg467jy0fd3188zla8q4l1iq0zdy28bcdipin693bfh";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ openvpn networkmanager ]

     

       15
       15
       -
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ];

     

       14
       14
       +
         buildInputs = [ openvpn networkmanager libsecret ]

     

       15
       15
       +
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring

     

       16
       16
       +
                                               gnome3.networkmanagerapplet ];

     

       16
       17
        
       

     

       17
       18
        
         nativeBuildInputs = [ intltool pkgconfig ];

     

       18
       19
        
       

     

       19
       20
        
         configureFlags = [

     

       20
       21
        
           "${if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"}"

     

       21
       22
        
           "--disable-static"

     

       23
       23
       +
           "--localstatedir=/" # needed for the management socket under /run/NetworkManager

     

       22
       24
        
         ];

     

       23
       25
        
       

     

       24
       26
        
         preConfigure = ''

+7 -6

pkgs/tools/networking/network-manager/pptp.nix

···

       1
       1
        
       { stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig, substituteAll

     

       2
       2
       -
       , withGnome ? true, gnome3 }:

     

       2
       2
       +
       , libsecret, withGnome ? true, gnome3 }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "${pname}${if withGnome then "-gnome" else ""}-${version}";

     

       6
       6
        
         pname = "NetworkManager-pptp";

     

       7
       7
       -
         version = "0.9.8.4";

     

       7
       7
       +
         version = networkmanager.version;

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
       -
           url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";

     

       11
       11
       -
           sha256 = "1s6wmznd6azvg028x8y3syniqy9j7nmx5j71w2wc6mk0f9pqzflp";

     

       10
       10
       +
           url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz";

     

       11
       11
       +
           sha256 = "0xpflw6vp1ahvpz7mnnldqvk455wz2j7dahd9lxqs95frmjmq390";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ networkmanager pptp ppp ]

     

       15
       15
       -
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ];

     

       14
       14
       +
         buildInputs = [ networkmanager pptp ppp libsecret ]

     

       15
       15
       +
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring

     

       16
       16
       +
                                               gnome3.networkmanagerapplet ];

     

       16
       17
        
       

     

       17
       18
        
         nativeBuildInputs = [ intltool pkgconfig ];

     

       18
       19

+7 -8

pkgs/tools/networking/network-manager/vpnc.nix

···

       1
       1
       -
       { stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager

     

       1
       1
       +
       { stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager, libsecret

     

       2
       2
        
       , withGnome ? true, gnome3, procps, module_init_tools }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "${pname}${if withGnome then "-gnome" else ""}-${version}";

     

       6
       6
        
         pname = "NetworkManager-vpnc";

     

       7
       7
       -
         # TODO: version doesn't match due to bad release

     

       8
       8
       -
         #version = networkmanager.version;

     

       9
       9
       -
         version = "0.9.8.6";

     

       7
       7
       +
         version = networkmanager.version;

     

       10
       8
        
       

     

       11
       9
        
         src = fetchurl {

     

       12
       12
       -
           url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";

     

       13
       13
       -
           sha256 = "1mmbm3q27b3dbbs4vs976cxif8jdcs92j3ajdbgykrnl2gbnqc20";

     

       10
       10
       +
           url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz";

     

       11
       11
       +
           sha256 = "154q6lcy99h00kyivjhsv21a2i4cw4ff35cbvh062bfd68wl3l2y";

     

       14
       12
        
         };

     

       15
       13
        
       

     

       16
       16
       -
         buildInputs = [ vpnc networkmanager ]

     

       17
       17
       -
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ];

     

       14
       14
       +
         buildInputs = [ vpnc networkmanager libsecret ]

     

       15
       15
       +
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring

     

       16
       16
       +
                                               gnome3.networkmanagerapplet ];

     

       18
       17
        
       

     

       19
       18
        
         nativeBuildInputs = [ intltool pkgconfig ];

     

       20
       19