pyrox.dev
fwbuilder: migrate to by-name (#427489)
+10
-11
pkgs/tools/security/fwbuilder/default.nix
pkgs/by-name/fw/fwbuilder/package.nix
+10
-11
pkgs/tools/security/fwbuilder/default.nix
pkgs/by-name/fw/fwbuilder/package.nix
···
4
4
fetchFromGitHub,
5
5
cmake,
6
6
ninja,
7
-
wrapQtAppsHook,
8
7
wayland,
9
8
wayland-protocols,
10
-
qtwayland,
9
+
libsForQt5,
11
10
}:
12
11
13
-
stdenv.mkDerivation rec {
12
+
stdenv.mkDerivation (finalAttrs: {
14
13
pname = "fwbuilder";
15
14
version = "6.0.0-rc1";
16
15
17
16
src = fetchFromGitHub {
18
17
owner = "fwbuilder";
19
18
repo = "fwbuilder";
20
-
rev = "v${version}";
19
+
tag = "v${finalAttrs.version}";
21
20
hash = "sha256-j5HjGcIqq93Ca9OBqEgSotoSXyw+q6Fqxa3hKk1ctwQ=";
22
21
};
23
22
···
31
30
nativeBuildInputs = [
32
31
cmake
33
32
ninja
34
-
wrapQtAppsHook
33
+
libsForQt5.wrapQtAppsHook
35
34
];
36
35
37
36
buildInputs = [
38
37
wayland
39
38
wayland-protocols
40
-
qtwayland
39
+
libsForQt5.qtwayland
41
40
];
42
41
43
-
meta = with lib; {
42
+
meta = {
44
43
description = "GUI Firewall Management Application";
45
44
longDescription = ''
46
45
Firewall Builder is a GUI firewall management application for iptables,
···
49
48
managed from a single UI.
50
49
'';
51
50
homepage = "https://github.com/fwbuilder/fwbuilder";
52
-
license = licenses.gpl2Only;
53
-
platforms = platforms.linux;
54
-
maintainers = [ maintainers.elatov ];
51
+
license = lib.licenses.gpl2Only;
52
+
platforms = lib.platforms.linux;
53
+
maintainers = with lib.maintainers; [ elatov ];
55
54
};
56
-
}
55
+
})
-2
pkgs/top-level/all-packages.nix
-2
pkgs/top-level/all-packages.nix
···
1088
1088
1089
1089
gp-saml-gui = python3Packages.callPackage ../tools/networking/gp-saml-gui { };
1090
1090
1091
-
fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { };
1092
-
1093
1091
inherit (callPackages ../tools/networking/ivpn/default.nix { })
1094
1092
ivpn
1095
1093
ivpn-service