1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 12:11:28 +00:00
Commit graph

62 commits

Author SHA1 Message Date
volth bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
Jonathan Ringer 9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Ben Siraphob 16d91ee628 pkgs/os-specific: stdenv.lib -> lib 2021-01-17 23:26:08 +07:00
ajs124 e60919c3d3 apparmor: 2.13.5 -> 2.13.6 2020-12-17 07:32:24 +01:00
Vladimír Čunát 336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +01:00
Vladimír Čunát c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
ajs124 b2602d1a39 apparmor: 2.13.4 -> 2.13.5 2020-10-20 21:03:28 +02:00
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
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +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 3b9ef2c71b fix "libc}/lib" and similar references
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
2015-05-05 11:52:08 +02:00
Joachim Fasting 029514b513 apparmor: 2.9.1 -> 2.9.2
Bugfixes & minor improvements
2015-04-24 12:42:58 +02:00
Joachim Fasting d3ea6abf0e libapparmor: build perl bindings
There are still a few utils which use Perl, though most have been ported to
Python. Note that SWIG v2 is required to avoid the `error: 'bool' undeclared`
build failure with Perl >=5.16 [1].

[1]: 4305a3cef9
2015-04-07 11:05:54 +02:00
Joachim Fasting 38dc021b16 apparmor: use base32 digest 2015-04-07 10:21:40 +02:00
Joachim Fasting b0698d4342 apparmor: fixup install locations
This patch fixes install locations for man pages, python modules
and vim scripts. This patch improves but does not fix the user-land
AppArmor utilities (i.e., they can now import the modules they need
but are broken in other ways still).
2015-03-18 12:11:02 +01:00
Joachim Fasting dc71d5b602 apparmor: factor out common prePatch 2015-03-18 12:08:11 +01:00