From 56d1e7a41bbbd1ce45bb088306c65d6395e552f0 Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Tue, 11 Jun 2024 22:18:26 +0200 Subject: lib.systems.examples: update default android sdk to 33, ndk to 26 --- nixos/doc/manual/release-notes/rl-2411.section.md | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'nixos') diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 889d399749323..95984e46013a6 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -49,6 +49,10 @@ before changing the package to `pkgs.stalwart-mail` in [`services.stalwart-mail.package`](#opt-services.stalwart-mail.package). +- `androidndkPkgs` has been updated to `androidndkPkgs_26`. + +- Android NDK version 26 and SDK version 33 are now the default versions used for cross compilation to android. + - `haskell.lib.compose.justStaticExecutables` now disallows references to GHC in the output by default, to alert users to closure size issues caused by [#164630](https://github.com/NixOS/nixpkgs/issues/164630). See ["Packaging -- cgit 1.4.1 From a754cd2effd6b7f1aa41bf168cc4fb95bf117add Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Sat, 22 Jun 2024 10:56:11 +0200 Subject: nixVersions.nix_2_18: 2.18.2 -> 2.18.3 It's a small round of various fixes for the default version of Nix. Diff: https://github.com/NixOS/nix/compare/2.18.2...2.18.3 --- nixos/modules/installer/tools/nix-fallback-paths.nix | 10 +++++----- pkgs/tools/package-management/nix/default.nix | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index e4241e9654036..9669ec5e37f3c 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/azvn85cras6xv4z5j85fiy406f24r1q0-nix-2.18.1"; - i686-linux = "/nix/store/9bnwy7f9h0kzdzmcnjjsjg0aak5waj40-nix-2.18.1"; - aarch64-linux = "/nix/store/hh65xwqm9s040s3cgn9vzcmrxj0sf5ij-nix-2.18.1"; - x86_64-darwin = "/nix/store/6zi5fqzn9n17wrk8r41rhdw4j7jqqsi3-nix-2.18.1"; - aarch64-darwin = "/nix/store/0pbq6wzr2f1jgpn5212knyxpwmkjgjah-nix-2.18.1"; + x86_64-linux = "/nix/store/yrsmzlw2lgbknzwic1gy1gmv3l2w1ax8-nix-2.18.3"; + i686-linux = "/nix/store/ds9381l9mlwfaclvqnkzn3jl4qb8m3y1-nix-2.18.3"; + aarch64-linux = "/nix/store/hw1zny3f8520zyskmp1qaybv1ir5ilxh-nix-2.18.3"; + x86_64-darwin = "/nix/store/z08yc4sl1fr65q53wz6pw30h67qafaln-nix-2.18.3"; + aarch64-darwin = "/nix/store/p57m7m0wrz8sqxiwinzpwzqzak82zn75-nix-2.18.3"; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5f2a9dadfd6b2..f5a351ed35aad 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -147,8 +147,8 @@ in lib.makeExtensible (self: ({ }; nix_2_18 = common { - version = "2.18.2"; - hash = "sha256-8gNJlBlv2bnffRg0CejiBXc6U/S6YeCLAdHrYvTPyoY="; + version = "2.18.3"; + hash = "sha256-430V4oN1Pid0h3J1yucrik6lbDh5D+pHI455bzLPEDY="; self_attribute_name = "nix_2_18"; }; -- cgit 1.4.1 From ab9b8f8cf4165e8fdd7d2b50b459832ec0069b4d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 22 Jun 2024 18:38:04 +0200 Subject: nixos/nextcloud: `services.nextcloud.occ` is not internal This option is actually useful when having a systemd unit invoking `nextcloud-occ`, then you want to do something like path = [ config.services.nextcloud.occ ] This is possible today, but not documented (and the option completion from nil doesn't pick it up as a result). --- nixos/modules/services/web-apps/nextcloud.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'nixos') diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index d7eb2c6cb734f..a7a3d01f1f450 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -642,7 +642,6 @@ in { type = types.package; default = occ; defaultText = literalMD "generated script"; - internal = true; description = '' The nextcloud-occ program preconfigured to target this Nextcloud instance. ''; -- cgit 1.4.1 From 50d5306e7c28085420cde8c533464ea8921e0e37 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 22 Jun 2024 18:39:08 +0200 Subject: nixos/nextcloud: use dedicated memory limit for the entire CLI Originally, I wanted to execute `nextcloud-occ` with a higher memory limit because I needed to trigger an expensive operation by hand, regenerating a bunch of previews. While doing so, I realized how painful it is to put an invocation of nextcloud-occ together for that, especially when you need to put it into another systemd unit in Nix code. That's why I decided to use the memory limit now for every CLI invocation just in case. The stuff you do in those units (e.g. running background jobs) is something you can also do by hand with `nextcloud-occ` and you'll most likely want to have the same memory limit there. --- nixos/modules/services/web-apps/nextcloud.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index a7a3d01f1f450..8d18c8e973915 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -80,6 +80,12 @@ let mkKeyValue = generators.mkKeyValueDefault {} " = "; }; + phpCli = concatStringsSep " " ([ + "${getExe phpPackage}" + ] ++ optionals (cfg.cli.memoryLimit != null) [ + "-dmemory_limit=${cfg.cli.memoryLimit}" + ]); + occ = pkgs.writeScriptBin "nextcloud-occ" '' #! ${pkgs.runtimeShell} cd ${webroot} @@ -89,7 +95,7 @@ let fi export NEXTCLOUD_CONFIG_DIR="${datadir}/config" $sudo \ - ${phpPackage}/bin/php \ + ${phpCli} \ occ "$@" ''; @@ -196,6 +202,9 @@ let in { imports = [ + (mkRenamedOptionModule + [ "services" "nextcloud" "cron" "memoryLimit" ] + [ "services" "nextcloud" "cli" "memoryLimit" ]) (mkRemovedOptionModule [ "services" "nextcloud" "enableBrokenCiphersForSSE" ] '' This option has no effect since there's no supported Nextcloud version packaged here using OpenSSL for RC4 SSE. @@ -793,7 +802,7 @@ in { }; }; - cron.memoryLimit = mkOption { + cli.memoryLimit = mkOption { type = types.nullOr types.str; default = null; example = "1G"; @@ -1009,14 +1018,8 @@ in { serviceConfig = { Type = "exec"; User = "nextcloud"; - ExecCondition = "${lib.getExe phpPackage} -f ${webroot}/occ status -e"; - ExecStart = lib.concatStringsSep " " ([ - (lib.getExe phpPackage) - ] ++ optional (cfg.cron.memoryLimit != null) "-dmemory_limit=${cfg.cron.memoryLimit}" - ++ [ - "-f" - "${webroot}/cron.php" - ]); + ExecCondition = "${phpCli} -f ${webroot}/occ status -e"; + ExecStart = "${phpCli} -f ${webroot}/cron.php"; KillMode = "process"; }; }; @@ -1040,7 +1043,7 @@ in { serviceConfig = { Type = "exec"; User = "nextcloud"; - ExecCondition = "${lib.getExe phpPackage} -f ${webroot}/occ status -e"; + ExecCondition = "${phpCli} -f ${webroot}/occ status -e"; }; }; }; -- cgit 1.4.1