Commit cbbe57bc authored by Alexandru Scvortov's avatar Alexandru Scvortov Committed by Yt
Browse files

elixir: make 1.15 default and pin existing pkgs to 1.14

parent 942908f7
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -390,6 +390,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.
+3 −3
Original line number Diff line number Diff line
@@ -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";
+2 −2
Original line number Diff line number Diff line
@@ -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
        ''
+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ let
      elvis-erlang = callPackage ./elvis-erlang { };

      # BEAM-based languages.
      elixir = elixir_1_14;
      elixir = elixir_1_15;

      elixir_1_15 = lib'.callElixir ../interpreters/elixir/1.15.nix {
        inherit erlang;
+4 −0
Original line number Diff line number Diff line
@@ -172,6 +172,10 @@ beamPackages.mixRelease rec {
  passthru = {
    tests = with nixosTests; { inherit akkoma akkoma-confined; };
    inherit mixNixDeps;

    # Used to make sure the service uses the same version of elixir as
    # the package
    elixirPackage = beamPackages.elixir;
  };

  meta = with lib; {
Loading