public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next' into staging

Browse Source 
The transmission conflict was non-trivial:
- libbrotli added to apparmor rules <https://github.com/NixOS/nixpkgs/commit/1bdda029cd85b5f4358697afd2c8f6a1996c6ccf>
- apparmor rules rewritten <https://github.com/NixOS/nixpkgs/commit/b280e64078d69c59cf4fccfcaa9d56a59d789dc9>

Chosen the rewrite and verified that brotli is part of the rule set generated by `apparmorRulesFromClosure`.
This commit is contained in:
Jan Tojnar
2021-05-06 08:42:50 +02:00
parent bc29d22a2c 305e1c9446
commit d9f177eb4d
73 changed files with 365 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix
+2 -7
View File
@@ -3,16 +3,11 @@
mkXfceDerivation {
category = "panel-plugins";
pname = "xfce4-clipman-plugin";
version = "1.6.1";
sha256 = "03akijvry1n1fkziyvxwcksl4vy4lmnpgd5izjs8jai5sndhsszl";
version = "1.6.2";
sha256 = "0pm4pzq3imc0m09mg0zk6kwcn5yzdgiqgdbpws01q3xz58jmb4a6";
buildInputs = [ libXtst libxfce4ui xfce4-panel xfconf ];
postPatch = ''
# exo-csource has been dropped from exo
substituteInPlace panel-plugin/Makefile.am --replace exo-csource xdt-csource
'';
meta = {
description = "Clipboard manager for Xfce panel";
};