diff options
| author | ajs124 <git@ajs124.de> | 2020-10-17 17:47:29 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-10-20 21:03:28 +0200 |
| commit | b2602d1a39a9c5774ff352e47870666a3e0bfb3e (patch) | |
| tree | 09b4d80f891292467b67794aef630bc310e5b555 /pkgs/os-specific/linux/apparmor | |
| parent | 70a924fa80e12df7b508e21d3a92f824ce238b5f (diff) | |
| download | nixpkgs-b2602d1a39a9c5774ff352e47870666a3e0bfb3e.tar nixpkgs-b2602d1a39a9c5774ff352e47870666a3e0bfb3e.tar.gz nixpkgs-b2602d1a39a9c5774ff352e47870666a3e0bfb3e.tar.bz2 nixpkgs-b2602d1a39a9c5774ff352e47870666a3e0bfb3e.tar.lz nixpkgs-b2602d1a39a9c5774ff352e47870666a3e0bfb3e.tar.xz nixpkgs-b2602d1a39a9c5774ff352e47870666a3e0bfb3e.tar.zst nixpkgs-b2602d1a39a9c5774ff352e47870666a3e0bfb3e.zip | |
apparmor: 2.13.4 -> 2.13.5
Diffstat (limited to 'pkgs/os-specific/linux/apparmor')
| -rw-r--r-- | pkgs/os-specific/linux/apparmor/default.nix | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 0e10add5561..64fa92be865 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -14,7 +14,7 @@ let apparmor-series = "2.13"; - apparmor-patchver = "4"; + apparmor-patchver = "5"; apparmor-version = apparmor-series + "." + apparmor-patchver; apparmor-meta = component: with stdenv.lib; { @@ -27,19 +27,10 @@ let apparmor-sources = fetchurl { url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; - sha256 = "03nislxccnbxld89giak2s8xa4mdbwscfxbdwhmw5qpvgz08dgwh"; - }; - - # See <https://gitlab.com/apparmor/apparmor/-/issues/74> This and the - # accompanying application in prePatchCommon should be removed in 2.13.5 - gnumake43Patch = fetchpatch { - url = "https://gitlab.com/apparmor/apparmor/-/merge_requests/465.patch"; - name = "2-23-fix-build-with-make-4.3.patch"; - sha256 = "0xw028iqp69j9mxv0kbwraplgkj5i5djdlgf0anpkc5cdbsf96r9"; + sha256 = "05x7r99k00r97v1cq2f711lv6yqzhbl8zp1i1c7kxra4v0a2lzk3"; }; prePatchCommon = '' - patch -p1 < ${gnumake43Patch} chmod a+x ./common/list_capabilities.sh ./common/list_af_names.sh patchShebangs ./common/list_capabilities.sh ./common/list_af_names.sh substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${buildPackages.perl}/bin/pod2man" |