Skip to content

Commit 06952f4

Browse files
Jappie3kfiz
authored andcommitted
dovecot_pigeonhole: patch regarding permission error
This patch fixes a permission issue that occurs when saving compiled sieve scripts sourced from the nix store. Instead of reusing the read-only permission bits from the nix store, it explicitly uses `0700` for the directory in which compiled sieve scripts should be saved. Additional context: - NixOS#388463 (comment) - dovecot/pigeonhole#15
1 parent 7707cbd commit 06952f4

3 files changed

Lines changed: 10 additions & 0 deletions

File tree

pkgs/by-name/do/dovecot/generic.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
patches ? [ ],
4949
# Re-exported plugins for this version
5050
dovecot_pigeonhole,
51+
dovecot_exporter,
5152
}:
5253
stdenv.mkDerivation {
5354
pname = "dovecot";
@@ -217,5 +218,6 @@ stdenv.mkDerivation {
217218
};
218219

219220
pigeonhole = dovecot_pigeonhole;
221+
exporter = dovecot_exporter;
220222
};
221223
}

pkgs/by-name/do/dovecot_pigeonhole/generic.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
url,
1010
version,
1111
hash,
12+
patches ? [ ],
1213
dovecot,
1314
}:
1415
stdenv.mkDerivation rec {

pkgs/by-name/do/dovecot_pigeonhole/package.nix

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
lib,
33
callPackage,
4+
fetchpatch,
45
dovecot,
56
}:
67
let
@@ -49,6 +50,12 @@ callPackage ./generic.nix { } rec {
4950
url = "https://pigeonhole.dovecot.org/releases/${lib.versions.majorMinor dovecot.version}/dovecot-pigeonhole-${version}.tar.gz";
5051
version = "2.4.0";
5152
hash = "sha256-DtCK4WOsOalEcgD7tC17OwXTXpHZmBjdD0r9etHbx1M=";
53+
patches = [
54+
(fetchpatch {
55+
url = "https://patch-diff.githubusercontent.com/raw/dovecot/pigeonhole/pull/15.patch";
56+
sha256 = "sha256-BLBz9ZhOGEIIitnXG0uM6bZBRNnQBy4K2IJlh1+Un50=";
57+
})
58+
];
5259

5360
inherit dovecot;
5461
}

0 commit comments

Comments
 (0)