git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #170952 from SuperSandro2000/firewalld

firewalld: init at 1.1.1

commit7e4329608cbf52abf3a3e13b529fbe324ae5cb30 authorSandro <sandro.jaeckel@gmail.com> dateWed 4 May 2022, 20:51 (5 years ago) parentad5e4daaeeb5eb
12 files changed+145−19
nixos/modules/programs/nm-applet.nix+1−1 nixos/modules/services/x11/desktop-managers/cinnamon.nix+1−1 pkgs/applications/networking/firewalld/default.nix+104 pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patch+13 pkgs/desktops/gnome/core/gnome-control-center/default.nix+3−2 pkgs/desktops/gnome/default.nix+1−1 pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix+2−2 pkgs/os-specific/linux/nftables/default.nix+7−9 pkgs/tools/networking/networkmanager/applet/default.nix+1−1 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+6−2 pkgs/top-level/python-packages.nix+5
nixos/modules/programs/nm-applet.nix+1−1
@@ -23,7 +23,7 @@
2323 description = "Network manager applet";
2424 wantedBy = [ "graphical-session.target" ];
2525 partOf = [ "graphical-session.target" ];
26− serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet ${lib.optionalString config.programs.nm-applet.indicator "--indicator"}";
26+ serviceConfig.ExecStart = "${pkgs.networkmanager-applet}/bin/nm-applet ${lib.optionalString config.programs.nm-applet.indicator "--indicator"}";
2727 };
2828
2929 services.dbus.packages = [ pkgs.gcr ];
nixos/modules/services/x11/desktop-managers/cinnamon.nix+1−1
@@ -136,7 +136,7 @@ in
136136 # session requirements
137137 cinnamon-screensaver
138138 # cinnamon-killer-daemon: provided by cinnamon-common
139− networkmanagerapplet # session requirement - also nm-applet not needed
139+ networkmanager-applet # session requirement - also nm-applet not needed
140140
141141 # For a polkit authentication agent
142142 polkit_gnome
pkgs/applications/networking/firewalld/default.nixnew file+104
@@ -0,0 +1,104 @@
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, autoreconfHook
5+, bash
6+, docbook_xml_dtd_42
7+, docbook-xsl-nons
8+, glib
9+, gobject-introspection
10+, gtk3
11+, intltool
12+, libnotify
13+, libxml2
14+, libxslt
15+, networkmanager-applet
16+, pkg-config
17+, python3
18+, wrapGAppsNoGuiHook
19+, withGui ? false
20+}:
21+
22+let
23+ pythonPath = python3.withPackages (ps: with ps; [
24+ dbus-python
25+ nftables
26+ pygobject3
27+ ] ++ lib.optionals withGui [
28+ pyqt5
29+ pyqt5_sip
30+ ]);
31+in
32+stdenv.mkDerivation rec {
33+ pname = "firewalld";
34+ version = "1.1.1";
35+
36+ src = fetchFromGitHub {
37+ owner = "firewalld";
38+ repo = "firewalld";
39+ rev = "v${version}";
40+ sha256 = "sha256-w8TbovIhOhJAUZWbKdBd/+db8Hro/ttlxWZDcrCXX4Q=";
41+ };
42+
43+ patches = [
44+ ./respect-xml-catalog-files-var.patch
45+ ];
46+
47+ postPatch = ''
48+ substituteInPlace src/firewall/config/__init__.py.in \
49+ --replace "/usr/share" "$out/share"
50+
51+ for file in config/firewall-{applet,config}.desktop.in; do
52+ substituteInPlace $file \
53+ --replace "/usr/bin/" "$out/bin/"
54+ done
55+ '' + lib.optionalString withGui ''
56+ substituteInPlace src/firewall-applet.in \
57+ --replace "/usr/bin/nm-connection-editor" "${networkmanager-applet}/bin/nm-conenction-editor"
58+ '';
59+
60+ nativeBuildInputs = [
61+ autoreconfHook
62+ docbook_xml_dtd_42
63+ docbook-xsl-nons
64+ glib
65+ intltool
66+ libxml2
67+ libxslt
68+ pkg-config
69+ python3
70+ python3.pkgs.wrapPython
71+ ] ++ lib.optionals withGui [
72+ gobject-introspection
73+ wrapGAppsNoGuiHook
74+ ];
75+
76+ buildInputs = [
77+ bash
78+ glib
79+ ] ++ lib.optionals withGui [
80+ gtk3
81+ libnotify
82+ pythonPath
83+ ];
84+
85+ dontWrapGApps = true;
86+
87+ preFixup = lib.optionalString withGui ''
88+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
89+ '';
90+
91+ postFixup = ''
92+ chmod +x $out/share/firewalld/*.py $out/share/firewalld/testsuite/python/*.py $out/share/firewalld/testsuite/{,integration/}testsuite
93+ patchShebangs --host $out/share/firewalld/testsuite/{,integration/}testsuite $out/share/firewalld/*.py
94+ wrapPythonProgramsIn "$out/bin" "$out ${pythonPath}"
95+ wrapPythonProgramsIn "$out/share/firewalld/testsuite/python" "$out ${pythonPath}"
96+ '';
97+
98+ meta = with lib; {
99+ description = "Firewall daemon with D-Bus interface";
100+ homepage = "https://github.com/firewalld/firewalld";
101+ license = licenses.gpl2Plus;
102+ maintainers = with maintainers; [ SuperSandro2000 ];
103+ };
104+}
pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patchnew file+13
@@ -0,0 +1,13 @@
1+--- a/m4/jh_path_xml_catalog.m4
2++++ b/m4/jh_path_xml_catalog.m4
3+@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG],
4+ [
5+ AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
6+ AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
7+- if $jh_found_xmlcatalog && \
8+- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
9++ # empty argument forces libxml to use XML_CATALOG_FILES variable
10++ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then
11+ AC_MSG_RESULT([found])
12+ ifelse([$3],,,[$3
13+ ])dnl
pkgs/desktops/gnome/core/gnome-control-center/default.nix+3−2
@@ -42,7 +42,7 @@
4242, modemmanager
4343, mutter
4444, networkmanager
45−, networkmanagerapplet
45+, networkmanager-applet
4646, libnma-gtk4
4747, ninja
4848, pkg-config
@@ -76,8 +76,9 @@ stdenv.mkDerivation rec {
7676 src = ./paths.patch;
7777 gcm = gnome-color-manager;
7878 gnome_desktop = gnome-desktop;
79+ networkmanagerapplet = networkmanager-applet;
7980 inherit glibc libgnomekbd tzdata;
80− inherit cups networkmanagerapplet;
81+ inherit cups;
8182 })
8283
8384 # Fix Online Accounts configuration on X11
pkgs/desktops/gnome/default.nix+1−1
@@ -379,7 +379,7 @@ lib.makeScope pkgs.newScope (self: with self; {
379379
380380 dconf = throw "The ‘gnome.dconf’ alias was removed on 2022-01-13. Please use ‘pkgs.dconf’ directly."; # added 2019-11-30
381381
382− networkmanagerapplet = throw "The ‘gnome.networkmanagerapplet’ alias was removed on 2022-01-13. Please use ‘pkgs.networkmanagerapplet’ directly."; # added 2019-12-12
382+ networkmanagerapplet = throw "The ‘gnome.networkmanagerapplet’ alias was removed on 2022-01-13. Please use ‘pkgs.networkmanager-applet’ directly."; # added 2019-12-12
383383
384384 glade = throw "The ‘gnome.glade’ alias was removed on 2022-01-13. Please use ‘pkgs.glade’ directly."; # added 2020-05-15
385385
pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix+2−2
@@ -11,7 +11,7 @@
1111, granite
1212, gtk3
1313, networkmanager
14−, networkmanagerapplet
14+, networkmanager-applet
1515, libnma
1616, switchboard
1717}:
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 patches = [
3131 (substituteAll {
3232 src = ./fix-paths.patch;
33− inherit networkmanagerapplet;
33+ networkmanagerapplet = networkmanager-applet;
3434 })
3535 ];
3636
pkgs/os-specific/linux/nftables/default.nix+7−9
@@ -8,8 +8,6 @@
88, withXtables ? true , iptables
99}:
1010
11−with lib;
12−
1311stdenv.mkDerivation rec {
1412 version = "1.0.2";
1513 pname = "nftables";
@@ -28,8 +26,8 @@ stdenv.mkDerivation rec {
2826 buildInputs = [
2927 libmnl libnftnl libpcap
3028 gmp jansson libedit
31− ] ++ optional withXtables iptables
32− ++ optional withPython python3;
29+ ] ++ lib.optional withXtables iptables
30+ ++ lib.optional withPython python3;
3331
3432 preConfigure = ''
3533 substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
@@ -46,12 +44,12 @@ stdenv.mkDerivation rec {
4644 configureFlags = [
4745 "--with-json"
4846 "--with-cli=editline"
49− ] ++ optional (!withDebugSymbols) "--disable-debug"
50− ++ optional (!withPython) "--disable-python"
51− ++ optional withPython "--enable-python"
52− ++ optional withXtables "--with-xtables";
47+ ] ++ lib.optional (!withDebugSymbols) "--disable-debug"
48+ ++ lib.optional (!withPython) "--disable-python"
49+ ++ lib.optional withPython "--enable-python"
50+ ++ lib.optional withXtables "--with-xtables";
5351
54− meta = {
52+ meta = with lib; {
5553 description = "The project that aims to replace the existing {ip,ip6,arp,eb}tables framework";
5654 homepage = "https://netfilter.org/projects/nftables/";
5755 license = licenses.gpl2Only;
pkgs/tools/networking/networkmanager/applet/default.nix+1−1
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
7474 passthru = {
7575 updateScript = gnome.updateScript {
7676 packageName = pname;
77− attrPath = "networkmanagerapplet";
77+ attrPath = "networkmanager-applet";
7878 versionPolicy = "odd-unstable";
7979 };
8080 };
pkgs/top-level/aliases.nix+1
@@ -849,6 +849,7 @@ mapAliases ({
849849 neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12
850850 netcat-openbsd = throw "'netcat-openbsd' has been renamed to/replaced by 'libressl.nc'"; # Converted to throw 2022-02-22
851851 netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31
852+ networkmanagerapplet = networkmanager-applet; # Added 2022-04-30
852853 networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22
853854 networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22
854855 networkmanager_l2tp = throw "'networkmanager_l2tp' has been renamed to/replaced by 'networkmanager-l2tp'"; # Converted to throw 2022-02-22
pkgs/top-level/all-packages.nix+6−2
@@ -8560,6 +8560,8 @@ with pkgs;
85608560
85618561 networkmanager = callPackage ../tools/networking/networkmanager { };
85628562
8563+ networkmanager-applet = callPackage ../tools/networking/networkmanager/applet { };
8564+
85638565 networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { };
85648566
85658567 networkmanager-openvpn = callPackage ../tools/networking/networkmanager/openvpn { };
@@ -8576,8 +8578,6 @@ with pkgs;
85768578
85778579 networkmanager-sstp = callPackage ../tools/networking/networkmanager/sstp { };
85788580
8579− networkmanagerapplet = callPackage ../tools/networking/networkmanager/applet { };
8580−
85818581 libnma = callPackage ../tools/networking/networkmanager/libnma { };
85828582
85838583 libnma-gtk4 = libnma.override { withGtk4 = true; };
@@ -26112,6 +26112,10 @@ with pkgs;
2611226112 inherit (darwin.apple_sdk.frameworks) Security;
2611326113 };
2611426114
26115+ firewalld = callPackage ../applications/networking/firewalld { };
26116+
26117+ firewalld-gui = firewalld.override { withGui = true; };
26118+
2611526119 flacon = libsForQt5.callPackage ../applications/audio/flacon { };
2611626120
2611726121 flexget = callPackage ../applications/networking/flexget { };
pkgs/top-level/python-packages.nix+5
@@ -5622,6 +5622,11 @@ in {
56225622
56235623 nextcord = callPackage ../development/python-modules/nextcord { };
56245624
5625+ nftables = toPythonModule (pkgs.nftables.override {
5626+ python3 = python;
5627+ withPython = true;
5628+ });
5629+
56255630 nghttp2 = (toPythonModule (pkgs.nghttp2.override {
56265631 inherit (self) python cython setuptools;
56275632 inherit (pkgs) ncurses;