Revert "apparmor: fix and improve the service"
This reverts commit fb6d63f3fd.
I really hope this finally fixes #99236: evaluation on Hydra.
This time I really did check basically the same commit on Hydra:
https://hydra.nixos.org/eval/1618011
Right now I don't have energy to find what exactly is wrong in the
commit, and it doesn't seem important in comparison to nixos-unstable
channel being stuck on a commit over one week old.
This commit is contained in:
@@ -1,6 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, ncurses, perl, help2man
|
||||
, apparmorRulesFromClosure
|
||||
}:
|
||||
{ stdenv, lib, fetchurl, ncurses, perl, help2man }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "inetutils-1.9.4";
|
||||
@@ -10,8 +8,6 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy";
|
||||
};
|
||||
|
||||
outputs = ["out" "apparmor"];
|
||||
|
||||
patches = [
|
||||
./whois-Update-Canadian-TLD-server.patch
|
||||
./service-name.patch
|
||||
@@ -45,22 +41,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
installFlags = [ "SUIDMODE=" ];
|
||||
|
||||
postInstall = ''
|
||||
install -D /dev/stdin $apparmor/bin.ping <<EOF
|
||||
$out/bin/ping {
|
||||
include <abstractions/base>
|
||||
include <abstractions/consoles>
|
||||
include <abstractions/nameservice>
|
||||
include "${apparmorRulesFromClosure {} [stdenv.cc.libc]}"
|
||||
include <local/bin.ping>
|
||||
capability net_raw,
|
||||
network inet raw,
|
||||
network inet6 raw,
|
||||
mr $out/bin/ping,
|
||||
}
|
||||
EOF
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Collection of common network programs";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user