diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-10-25 09:38:02 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-10-25 09:41:51 +0100 |
commit | c778945806b44d46ec16bc4302e7e7163e6bab97 (patch) | |
tree | 8c9c088a40cc1619fe6a27e32d295df45c9e9ebc /pkgs/os-specific/linux/apparmor | |
parent | 38f85a5bba7038f31a352b09ff7bc68fcbad2633 (diff) | |
download | nixpkgs-c778945806b44d46ec16bc4302e7e7163e6bab97.tar nixpkgs-c778945806b44d46ec16bc4302e7e7163e6bab97.tar.gz nixpkgs-c778945806b44d46ec16bc4302e7e7163e6bab97.tar.bz2 nixpkgs-c778945806b44d46ec16bc4302e7e7163e6bab97.tar.lz nixpkgs-c778945806b44d46ec16bc4302e7e7163e6bab97.tar.xz nixpkgs-c778945806b44d46ec16bc4302e7e7163e6bab97.tar.zst nixpkgs-c778945806b44d46ec16bc4302e7e7163e6bab97.zip |
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits. This reverts commit 17f5305b6c20df795c365368d2d868266519599e, reversing changes made to a8a018ddc0a8b5c3d4fa94c94b672c37356bc075.
Diffstat (limited to 'pkgs/os-specific/linux/apparmor')
-rw-r--r-- | pkgs/os-specific/linux/apparmor/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 64fa92be865..0e10add5561 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 = "5"; + apparmor-patchver = "4"; apparmor-version = apparmor-series + "." + apparmor-patchver; apparmor-meta = component: with stdenv.lib; { @@ -27,10 +27,19 @@ let apparmor-sources = fetchurl { url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; - sha256 = "05x7r99k00r97v1cq2f711lv6yqzhbl8zp1i1c7kxra4v0a2lzk3"; + 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"; }; 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" |