diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-09-29 09:16:47 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-09-29 09:16:47 +0200 |
| commit | 8ba120420fbdd9bd35b3a5366fa0206d8c99ade3 (patch) | |
| tree | 24fa0aeda94ac2d578a1752373e9a04da265cc88 /nixos | |
| parent | fd7a18259e351055b656f2cb1260d831edb9dd57 (diff) | |
| parent | 5a18fc74cfb4fac3083efd8d7a18d000334a890f (diff) | |
| download | nixlib-8ba120420fbdd9bd35b3a5366fa0206d8c99ade3.tar nixlib-8ba120420fbdd9bd35b3a5366fa0206d8c99ade3.tar.gz nixlib-8ba120420fbdd9bd35b3a5366fa0206d8c99ade3.tar.bz2 nixlib-8ba120420fbdd9bd35b3a5366fa0206d8c99ade3.tar.lz nixlib-8ba120420fbdd9bd35b3a5366fa0206d8c99ade3.tar.xz nixlib-8ba120420fbdd9bd35b3a5366fa0206d8c99ade3.tar.zst nixlib-8ba120420fbdd9bd35b3a5366fa0206d8c99ade3.zip | |
Merge #191339: staging-next 2022-09-15
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/config/i18n.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/misc/paperless.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/all-tests.nix | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index f73f10f0f369..b1efc00773dc 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -10,12 +10,12 @@ with lib; i18n = { glibcLocales = mkOption { type = types.path; - default = pkgs.buildPackages.glibcLocales.override { + default = pkgs.glibcLocales.override { allLocales = any (x: x == "all") config.i18n.supportedLocales; locales = config.i18n.supportedLocales; }; defaultText = literalExpression '' - pkgs.buildPackages.glibcLocales.override { + pkgs.glibcLocales.override { allLocales = any (x: x == "all") config.i18n.supportedLocales; locales = config.i18n.supportedLocales; } diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index e11158f8a12b..6a98d5cb686d 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -80,7 +80,7 @@ let RestrictSUIDSGID = true; SupplementaryGroups = optional enableRedis redisServer.user; SystemCallArchitectures = "native"; - SystemCallFilter = [ "@system-service" "~@privileged @resources @setuid @keyring" ]; + SystemCallFilter = [ "@system-service" "~@privileged @setuid @keyring" ]; # Does not work well with the temporary root #UMask = "0066"; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ed09aa9e8e4c..d5eb4a399d60 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -198,7 +198,6 @@ in { ferm = handleTest ./ferm.nix {}; firefox = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox; }; firefox-esr = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr; }; # used in `tested` job - firefox-esr-91 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-91; }; firefox-esr-102 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-102; }; firejail = handleTest ./firejail.nix {}; firewall = handleTest ./firewall.nix {}; |