From 9b66f27082e545a4a3bdb33fdb4527143a975762 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 14 Jul 2026 00:18:59 +0200 Subject: [PATCH] apparmor-parser: remove rc.apparmor.functions references --- .../fix-rc.apparmor.functions.sh | 32 ------------------- pkgs/by-name/ap/apparmor-parser/package.nix | 7 ---- 2 files changed, 39 deletions(-) delete mode 100644 pkgs/by-name/ap/apparmor-parser/fix-rc.apparmor.functions.sh diff --git a/pkgs/by-name/ap/apparmor-parser/fix-rc.apparmor.functions.sh b/pkgs/by-name/ap/apparmor-parser/fix-rc.apparmor.functions.sh deleted file mode 100644 index ebc1baaa92d4..000000000000 --- a/pkgs/by-name/ap/apparmor-parser/fix-rc.apparmor.functions.sh +++ /dev/null @@ -1,32 +0,0 @@ -aa_action() { - STRING=$1 - shift - $* - rc=$? - if [ $rc -eq 0 ] ; then - aa_log_success_msg $"$STRING " - else - aa_log_failure_msg $"$STRING " - fi - return $rc -} - -aa_log_success_msg() { - [ -n "$1" ] && echo -n $1 - echo ": done." -} - -aa_log_warning_msg() { - [ -n "$1" ] && echo -n $1 - echo ": Warning." -} - -aa_log_failure_msg() { - [ -n "$1" ] && echo -n $1 - echo ": Failed." -} - -aa_log_skipped_msg() { - [ -n "$1" ] && echo -n $1 - echo ": Skipped." -} diff --git a/pkgs/by-name/ap/apparmor-parser/package.nix b/pkgs/by-name/ap/apparmor-parser/package.nix index de39713f0c10..8844ca83b316 100644 --- a/pkgs/by-name/ap/apparmor-parser/package.nix +++ b/pkgs/by-name/ap/apparmor-parser/package.nix @@ -11,7 +11,6 @@ # apparmor deps libapparmor, - apparmor-bin-utils, runtimeShellPackage, # testing @@ -25,12 +24,6 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs . - - substituteInPlace init/rc.apparmor.functions \ - --replace-fail "/sbin/apparmor_parser" "$out/bin/apparmor_parser" \ - --replace-fail "/usr/sbin/aa-status" "${lib.getExe' apparmor-bin-utils "aa-status"}" - sed -i init/rc.apparmor.functions -e '2i . ${./fix-rc.apparmor.functions.sh}' - cd parser substituteInPlace Makefile \