3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

46 commits

Author SHA1 Message Date
Vladimír Čunát 420f89ceb2
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.
2020-10-07 12:22:18 +02:00
Julien Moutinho fb6d63f3fd apparmor: fix and improve the service 2020-09-06 07:43:03 +02:00
Sascha Grunert 372edacef2
apparmor: fix apparmor_parser path for utils package
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-08-23 20:42:59 +02:00
Vladimír Čunát 6f8b1aec39
Revert "apparmor: only apply the gnumake fix to the parser"
This reverts commit 4b028aecae, as planned.
2020-07-18 17:50:42 +02:00
Vladimír Čunát 4b028aecae
apparmor: only apply the gnumake fix to the parser
This is to avoid the huge rebuild for now, as it seems to be enough to
fix the problem, but I'll revert this on staging anyway.
2020-07-18 17:46:37 +02:00
Sarah Brofeldt 8da4505aa6 libapparmor: Fix build with gnumake 4.3 2020-07-16 23:46:00 +02:00
Lila 7517299146
treewide: fix broken AlpineLinux repo links (#87892) 2020-05-15 16:58:27 +01:00
Jan Tojnar 3e0f4e202f
Merge branch 'master' into staging-next 2020-03-31 21:32:15 +02:00
Patrick Hilhorst 5b49816cf4
treewide: add quotes to recently-changed urls
Co-Authored-By: Drew <drewrisinger@users.noreply.github.com>
2020-03-28 00:05:50 +01:00
Patrick Hilhorst 9fc5e7e473
treewide: fix redirected urls (again)
Ran the same script as #78265.
Additionally, manually replaced `http://goodies.xfce.org`
with https.
2020-03-20 13:36:23 +01:00
ajs124 2d364c6793 apparmor: 2.13.3 -> 2.13.4
drop patches that were merged upstream
2020-03-12 23:42:43 +00:00
Frederik Rietdijk 7f81119550 libapparmor: support python 3.8 2020-01-06 19:12:20 +01:00
Robin Gloster ac8eaa8507
treewide: fix *Flags 2019-12-30 04:50:37 +01:00
ajs124 751cb474bd apparmor: 2.13.1 -> 2.13.3 2019-09-30 13:22:01 +02:00
Ding Xiang Fei 63fcc2a0a9 apparmor: make apparmor cross-compile 2019-06-29 19:17:21 +08:00
Matthew Bauer 498ad3e8c0 apparmor: use stdenv.lib.getDev for headers 2019-02-24 17:00:48 -05:00
volth bb9557eb7c lib.makePerlPath -> perlPackages.makePerlPath 2018-12-15 03:50:31 +00:00
Will Dietz e82d79b679 libapparmor: drop conflicting patch, fix build w/musl 2018-11-29 08:48:27 -06:00
Joachim Fasting 6bd6c97ae8
apparmor: 2.12.0 -> 2.13.1 2018-10-22 20:36:34 +02:00
Tuomas Tynkkynen 50d0360888 apparmor: Replace meta.available checks
This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.
2018-09-28 15:01:00 +03:00
John Ericson 34da7e2ce2 treewide: Remove stdenv.isCross
I *want* cross-specific overrides to be verbose, so I rather not have
this shorthand. This makes the syntactic overhead more proportional to
the maintainence cost. Hopefully this pushes people towards fewer
conditionals and more abstractions.
2018-08-02 15:01:58 -04:00
Jan Malakhovski 7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Shea Levy e21300a6ae
libapparmor: Fix cross-compilation. 2018-02-25 09:38:55 -05:00
Will Dietz 3b5e1131a7 libapparmor: Add musl patches from Alpine
(update: drop patches no longer needed on updated version)
2018-02-13 09:44:49 -06:00
corpix 0db68e5d42 apparmor: updating utilities to fresh python (#34049)
* apparmor: updating utilities to fresh python

* apparmor: better way to depend on python

* apparmor: override python derivation on the top-level
2018-01-20 09:29:03 +01:00
adisbladis d672a9a5cd
apparmor: 2.10 -> 2.12.0 2017-12-31 16:40:19 +01:00
Vladimír Čunát 6eeea6effd Python: more evaluation fixups. 2016-10-14 00:03:12 +02:00
Eelco Dolstra e05c4c6541 libapparmor: Move python stuff to a separate output
This prevents systemd and by extension a zillion other packages from
having Python 2.7 in their closure. For example, the closure of
systemd dropped from 133 MiB to 85 MiB.
2016-09-01 18:57:43 +02:00
Joachim Fasting 192a1ada24
apparmor: cleanups
- Move build tools to nativeBuildInputs
- capability.h should come from linuxHeaders not glibc
- Delete v2.9
2016-04-18 02:21:12 +02:00
Vladimír Čunát 9d19ac7d0d apparmor: fixup to use some multiple-output paths 2015-10-03 16:37:26 +02:00
Joachim Fasting fdb4633e4b apparmor-utils: wrap python and perl scripts
This allows all utilties to at least run, though most still fail
because they expect to be able to read a non-existent config file.

Also, aa-notify refuses to run due to a self-check on the filename,
which cannot be preceded by a '.'. This has to be patched or we
need to set PERL5LIB some other way.
2015-08-26 22:58:12 +02:00
Joachim Fasting ed5f6be317 apparmor: use standard phase hooks 2015-08-26 22:58:12 +02:00
Joachim Fasting 1dd8dd4ca8 apparmor: 2.9.1 -> 2.10
An incremental release, including several fixes to the parser, library, and
userspace management tools. See [1] for a comprehensive changelog.

[1]: http://wiki.apparmor.net/index.php/ReleaseNotes_2_10
2015-08-26 22:58:12 +02:00
Austin Seipp 9c0f3d8829 nixpkgs: apparmor - remove dbus dependency
This was untested and didn't function without a dbus patch which wasn't
applied to the system dbus package, so it wasn't used at all.

Also, it creates a weird cyclic dependency if we want systemd to depend
on libapparmor (for AppArmorProfiles= support), because libapparmor then
wants dbus, and dbus wants systemd. Oof.

Luckily, this feature and whatnot will probably all be irrelevant in the
glorious kdbus-based future, and the dbus patches aren't even upstream I
think. So we can just drop it.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-08-26 22:58:11 +02:00
Austin Seipp cbacab73ed nixpkgs: default to apparmor 2.9 (#7220)
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-08-26 22:58:00 +02:00
Vladimír Čunát 8c2f7fcfed apparmor: don't depend on tetex
It seemed unused - no mention in the log, and builds without it.
/cc maintainers: @phreedom, @thoughtpolice.
2015-08-26 20:38:41 +02:00
Vladimír Čunát 62e5e2a880 apparmor: fix build by using older perl
This is work around #5270.
Also bogus path in wrapper got fixed.

CC: maintainers @phreedom, @thoughtpolice.
It would be better to test this as well by someone who actually uses it.
2014-12-10 16:11:29 +01:00
Evgeny Egorochkin d4b190cc4c apparmor: update from 2.8.3 to 2.8.4 2014-11-15 22:20:16 +02:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Austin Seipp f7123982c2 apparmor: 2.8.2 -> 2.8.3
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-17 14:09:09 -05:00
Nixpkgs Monitor 741b202d72 apparmor: update from 2.8.1 to 2.8.2 2013-12-09 11:04:25 +02:00
Bjørn Forsman 28ac782583 Some description fixes
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
2013-10-05 19:36:23 +02:00
Evgeny Egorochkin 1ee86005b9 Apparmor: minor cleanup 2013-05-11 21:14:35 +03:00
Evgeny Egorochkin a9459797e2 AppArmor: fix silent build breakage. 2013-05-11 08:50:33 +03:00
Evgeny Egorochkin 0ef509b1e0 Apparmor: update to 2.8.1 2013-05-10 16:36:11 +03:00
Evgeny Egorochkin cf8d3fa4b9 Apparmor: packaged
svn path=/nixpkgs/trunk/; revision=32695
2012-02-29 13:30:10 +00:00