Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ab21a2139e06
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7c9437104a5b
Choose a head ref
  • 2 commits
  • 5 files changed
  • 2 contributors

Commits on May 19, 2017

  1. networkmanager_fortisslvpn: init at 1.2.4

    Stefan Lau authored and selaux committed May 19, 2017
    Copy the full SHA
    a3696aa View commit details

Commits on May 20, 2017

  1. Merge pull request #25925 from selaux/networkmanager_fortisslvpn

    networkmanager_fortisslvpn: init at 1.2.4
    Mic92 authored May 20, 2017
    Copy the full SHA
    7c94371 View commit details
5 changes: 4 additions & 1 deletion nixos/modules/services/networking/networkmanager.nix
Original file line number Diff line number Diff line change
@@ -124,7 +124,7 @@ in {
type = types.attrsOf types.package;
default = { inherit networkmanager modemmanager wpa_supplicant
networkmanager_openvpn networkmanager_vpnc
networkmanager_openconnect
networkmanager_openconnect networkmanager_fortisslvpn
networkmanager_pptp networkmanager_l2tp; };
internal = true;
};
@@ -222,6 +222,9 @@ in {
{ source = "${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name";
target = "NetworkManager/VPN/nm-openconnect-service.name";
}
{ source = "${networkmanager_fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name";
target = "NetworkManager/VPN/nm-fortisslvpn-service.name";
}
{ source = "${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name";
target = "NetworkManager/VPN/nm-pptp-service.name";
}
2 changes: 1 addition & 1 deletion nixos/modules/services/x11/desktop-managers/gnome3.nix
Original file line number Diff line number Diff line change
@@ -186,7 +186,7 @@ in {
networking.networkmanager.basePackages =
{ inherit (pkgs) networkmanager modemmanager wpa_supplicant;
inherit (gnome3) networkmanager_openvpn networkmanager_vpnc
networkmanager_openconnect networkmanager_pptp
networkmanager_openconnect networkmanager_fortisslvpn networkmanager_pptp
networkmanager_l2tp; };

# Needed for themes and backgrounds
4 changes: 4 additions & 0 deletions pkgs/desktops/gnome-3/3.22/default.nix
Original file line number Diff line number Diff line change
@@ -212,6 +212,10 @@ let
inherit gnome3;
};

networkmanager_fortisslvpn = pkgs.networkmanager_fortisslvpn.override {
inherit gnome3;
};

networkmanager_l2tp = pkgs.networkmanager_l2tp.override {
inherit gnome3;
};
36 changes: 36 additions & 0 deletions pkgs/tools/networking/network-manager/fortisslvpn.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{ stdenv, fetchurl, openfortivpn, automake, autoconf, libtool, intltool, pkgconfig,
networkmanager, ppp, lib, libsecret, withGnome ? true, gnome3, procps, kmod }:

stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
pname = "NetworkManager-fortisslvpn";
major = "1.2";
version = "${major}.4";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
sha256 = "0wsbj5lvf9l1w8k5nmaqnzmldilh482bn4z4k8a3wnm62xfxgscr";
};

buildInputs = [ openfortivpn networkmanager ppp libtool libsecret ]
++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring gnome3.gconf gnome3.networkmanagerapplet ];

nativeBuildInputs = [ automake autoconf intltool pkgconfig ];

configureFlags = [
"${if withGnome then "--with-gnome" else "--without-gnome"}"
"--disable-static"
"--localstatedir=/tmp"
];

preConfigure = ''
substituteInPlace "src/nm-fortisslvpn-service.c" \
--replace "/bin/openfortivpn" "${openfortivpn}/bin/openfortivpn"
'';

meta = {
description = "NetworkManager's FortiSSL plugin";
inherit (networkmanager.meta) maintainers platforms;
};
}

2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -3209,6 +3209,8 @@ with pkgs;

networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { };

networkmanager_fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn.nix { };

networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan.nix { };

networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager-applet { };