diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-03 00:02:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-03 00:02:23 +0000 |
commit | 75a11d85b89dd3d74ffacc7f6900e0c189c5cb95 (patch) | |
tree | 393babe34b5e478fe5f6ff18f5f06fe8c72283e6 /nixos | |
parent | b1b0b6e3e76960d83239fc293cf5902adb01a91d (diff) | |
parent | 529fd47f28707310775d5ddcc5763740e2feed01 (diff) | |
download | nixlib-75a11d85b89dd3d74ffacc7f6900e0c189c5cb95.tar nixlib-75a11d85b89dd3d74ffacc7f6900e0c189c5cb95.tar.gz nixlib-75a11d85b89dd3d74ffacc7f6900e0c189c5cb95.tar.bz2 nixlib-75a11d85b89dd3d74ffacc7f6900e0c189c5cb95.tar.lz nixlib-75a11d85b89dd3d74ffacc7f6900e0c189c5cb95.tar.xz nixlib-75a11d85b89dd3d74ffacc7f6900e0c189c5cb95.tar.zst nixlib-75a11d85b89dd3d74ffacc7f6900e0c189c5cb95.zip |
Merge master into staging-next
Diffstat (limited to 'nixos')
4 files changed, 9 insertions, 6 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index ff7268b05ea9..05e648a74fe6 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -402,6 +402,9 @@ - `zfs` was updated from 2.1.x to 2.2.0, [enabling newer kernel support and adding new features](https://github.com/openzfs/zfs/releases/tag/zfs-2.2.0). +- Elixir now defaults to version + [v1.15](https://elixir-lang.org/blog/2023/06/19/elixir-v1-15-0-released/). + - A new option was added to the virtualisation module that enables specifying explicitly named network interfaces in QEMU VMs. The existing `virtualisation.vlans` is still supported for cases where the name of the network interface is irrelevant. - DocBook option documentation is no longer supported, all module documentation now uses markdown. diff --git a/nixos/modules/services/continuous-integration/woodpecker/server.nix b/nixos/modules/services/continuous-integration/woodpecker/server.nix index dc8f1567f1e3..38b42f7288c0 100644 --- a/nixos/modules/services/continuous-integration/woodpecker/server.nix +++ b/nixos/modules/services/continuous-integration/woodpecker/server.nix @@ -33,7 +33,7 @@ in environmentFile = lib.mkOption { type = with lib.types; coercedTo path (f: [ f ]) (listOf path); default = [ ]; - example = "/root/woodpecker-server.env"; + example = [ "/root/woodpecker-server.env" ]; description = lib.mdDoc '' File to load environment variables from. This is helpful for specifying secrets. diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix index eaee70c712bb..5f9bbbd66374 100644 --- a/nixos/modules/services/web-apps/akkoma.nix +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -86,7 +86,7 @@ let # Erlang/Elixir uses a somewhat special format for IP addresses erlAddr = addr: fileContents (pkgs.runCommand addr { - nativeBuildInputs = with pkgs; [ elixir ]; + nativeBuildInputs = [ cfg.package.elixirPackage ]; code = '' case :inet.parse_address('${addr}') do {:ok, addr} -> IO.inspect addr @@ -96,7 +96,7 @@ let passAsFile = [ "code" ]; } ''elixir "$codePath" >"$out"''); - format = pkgs.formats.elixirConf { }; + format = pkgs.formats.elixirConf { elixir = cfg.package.elixirPackage; }; configFile = format.generate "config.exs" (replaceSec (attrsets.updateManyAttrsByPath [{ @@ -146,7 +146,7 @@ let initSecretsScript = writeShell { name = "akkoma-init-secrets"; - runtimeInputs = with pkgs; [ coreutils elixir ]; + runtimeInputs = with pkgs; [ coreutils cfg.package.elixirPackage ]; text = let key-base = web.secret_key_base; jwt-signer = ex.":joken".":default_signer"; diff --git a/nixos/modules/services/web-apps/mobilizon.nix b/nixos/modules/services/web-apps/mobilizon.nix index e9264a38f0e6..343c5cead2b1 100644 --- a/nixos/modules/services/web-apps/mobilizon.nix +++ b/nixos/modules/services/web-apps/mobilizon.nix @@ -8,7 +8,7 @@ let user = "mobilizon"; group = "mobilizon"; - settingsFormat = pkgs.formats.elixirConf { elixir = pkgs.elixir_1_14; }; + settingsFormat = pkgs.formats.elixirConf { elixir = cfg.package.elixirPackage; }; configFile = settingsFormat.generate "mobilizon-config.exs" cfg.settings; @@ -309,7 +309,7 @@ in genCookie = "IO.puts(Base.encode32(:crypto.strong_rand_bytes(32)))"; evalElixir = str: '' - ${pkgs.elixir_1_14}/bin/elixir --eval '${str}' + ${cfg.package.elixirPackage}/bin/elixir --eval '${str}' ''; in '' |