diff --git a/pkgs/by-name/ap/apparmor-parser/package.nix b/pkgs/by-name/ap/apparmor-parser/package.nix index f3b884aa9b10..2199423a37be 100644 --- a/pkgs/by-name/ap/apparmor-parser/package.nix +++ b/pkgs/by-name/ap/apparmor-parser/package.nix @@ -59,9 +59,15 @@ stdenv.mkDerivation (finalAttrs: { checkTarget = "tests"; + checkFlags = lib.optionals stdenv.hostPlatform.isMusl [ + # equality tests are broken on musl due to different priority values + # https://gitlab.com/apparmor/apparmor/-/issues/513 + "-o equality" + ]; + postCheck = "popd"; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isMusl; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; checkInputs = [ bashInteractive perl diff --git a/pkgs/by-name/li/libapparmor/package.nix b/pkgs/by-name/li/libapparmor/package.nix index 37f941e3dac6..caba93785756 100644 --- a/pkgs/by-name/li/libapparmor/package.nix +++ b/pkgs/by-name/li/libapparmor/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch2, autoreconfHook, autoconf-archive, pkg-config, @@ -33,27 +32,16 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libapparmor"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitLab { owner = "apparmor"; repo = "apparmor"; tag = "v${finalAttrs.version}"; - hash = "sha256-oj6mGw/gvoRGpJqw72Lk6LJuurg8efjiV1pvZYbXz6A="; + hash = "sha256-f9FgowlV4lZKKuddGCirqbajhIGyTUQc7IFHSvqY6eQ="; }; sourceRoot = "${finalAttrs.src.name}/libraries/libapparmor"; - patches = [ - # avoid creating non-reproducible pycache in check phase - # https://gitlab.com/apparmor/apparmor/-/merge_requests/1697 - # remove on next release - (fetchpatch2 { - url = "https://gitlab.com/apparmor/apparmor/-/commit/b50ee983522f0efb5920676db545ae25b2e8998d.patch"; - hash = "sha256-AXl0osJHX4uUGppiOuHjpvlSRChqGyRCqv+8TYoLYMk="; - stripLen = 2; - }) - ]; - postPatch = '' substituteInPlace swig/perl/Makefile.am \ --replace-fail install_vendor install_site