Commit 81ed1c72 authored by K900's avatar K900
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents bdee0169 5046a3a4
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -244,6 +244,8 @@

- `rocmPackages.triton` has been removed in favor of `python3Packages.triton`.

- `oink` service no longer accepts `settings.apiKey` and `settings.secretApiKey` options as these have been replaced by `apiKeyFile` and `secretApiKeyFile`.

- `linpinyin`, which is used for Chinese character input, has migrated from the unmaintained BDB database format to the newer KyotoCabinet database format. If you want to migrate your user input statistics you can consider using [bdbtokyotodb](https://codeberg.org/raboof/bdbtokyotodb).

- `go-mockery` has been updated to v3. For migration instructions see the [upstream documentation](https://vektra.github.io/mockery/latest/v3/). If v2 is still required `go-mockery_v2` has been added but will be removed on or before 2029-12-31 in-line with its [upstream support lifecycle](https://vektra.github.io/mockery/)
+5 −0
Original line number Diff line number Diff line
@@ -747,6 +747,11 @@ lib.mapAttrs mkLicense (
      fullName = "Historical Permission Notice and Disclaimer - University of California variant";
    };

    hyphenBulgarian = {
      fullName = "hyphen-bulgarian License";
      spdxId = "hyphen-bulgarian";
    };

    # Intel's license, seems free
    iasl = {
      spdxId = "Intel-ACPI";
+0 −1
Original line number Diff line number Diff line
@@ -220,7 +220,6 @@
      "gshpychka": 23005347,
      "hexagonal-sun": 222664,
      "heywoodlh": 18178614,
      "iedame": 60272,
      "isabelroses": 71222764,
      "jonhermansen": 660911,
      "juliusrickert": 5007494,
+14 −8
Original line number Diff line number Diff line
@@ -1156,10 +1156,11 @@
    name = "Alexandru Nechita";
  };
  alexandrutocar = {
    email = "at@myquiet.place";
    email = "alexandru.tocar@outlook.com";
    github = "alexandrutocar";
    githubId = 65486851;
    name = "Alexandru Tocar";
    keys = [ { fingerprint = "B617 DD24 3AB0 2E3F 2E67  DBFD 1305 2A85 D7A4 2AA4"; } ];
  };
  alexarice = {
    email = "alexrice999@hotmail.co.uk";
@@ -10840,12 +10841,6 @@
    githubId = 1550265;
    name = "Dominic Steinitz";
  };
  iedame = {
    email = "git@ieda.me";
    github = "iedame";
    githubId = 60272;
    name = "Rafael Ieda";
  };
  if-loop69420 = {
    github = "if-loop69420";
    githubId = 81078181;
@@ -12602,7 +12597,7 @@
    name = "Ioannis Koutras";
  };
  jolars = {
    email = "jolars@posteo.com";
    email = "johan@jolars.co";
    matrix = "@jola:mozilla.org";
    github = "jolars";
    githubId = 13087841;
@@ -23961,6 +23956,7 @@
    githubId = 49711232;
    github = "ShyAssassin";
    email = "ShyAssassin@assassin.dev";
    keys = [ { fingerprint = "370E 8296 12AF D0E1 9A1A  88F6 AA81 2447 4716 E56D"; } ];
  };
  shyim = {
    email = "s.sayakci@gmail.com";
@@ -28911,6 +28907,16 @@
    name = "Zexin Yuan";
    keys = [ { fingerprint = "FE16 B281 90EF 6C3F F661  6441 C2DD 1916 FE47 1BE2"; } ];
  };
  zacharyarnaise = {
    name = "Zachary Arnaise";
    github = "zacharyarnaise";
    githubId = 121795280;
    keys = [
      {
        fingerprint = "5C1A 2BE8 C6B4 AFC0 DE82  73E9 B1F3 94D8 D460 C3B2";
      }
    ];
  };
  zacharyweiss = {
    name = "Zachary Weiss";
    email = "me@zachary.ws";
+28 −9
Original line number Diff line number Diff line
@@ -20,15 +20,17 @@ in
  options.services.oink = {
    enable = lib.mkEnableOption "Oink, a dynamic DNS client for Porkbun";
    package = lib.mkPackageOption pkgs "oink" { };
    settings = {
      apiKey = lib.mkOption {
        type = lib.types.str;
        description = "API key to use when modifying DNS records.";
    apiKeyFile = lib.mkOption {
      type = lib.types.path;
      example = "/run/keys/oink-api-key";
      description = "Path to a file containing the API key to use when modifying DNS records.";
    };
      secretApiKey = lib.mkOption {
        type = lib.types.str;
        description = "Secret API key to use when modifying DNS records.";
    secretApiKeyFile = lib.mkOption {
      type = lib.types.path;
      example = "/run/keys/oink-secret-api-key";
      description = "Path to a file containing the secret API key to use when modifying DNS records.";
    };
    settings = {
      interval = lib.mkOption {
        # https://github.com/rlado/oink/blob/v1.1.1/src/main.go#L364
        type = lib.types.ints.between 60 172800; # 48 hours
@@ -79,12 +81,29 @@ in
    };
  };

  imports = [
    (lib.mkRemovedOptionModule [ "services" "oink" "settings" "apiKey" ] ''
      This option has been removed because it would make the API key world-readable.
      Use {option}`apiKeyFile` instead.
      If you insist on keeping the API key world-readable, you can use `oink.apiKeyFile = pkgs.writeText "api-key" "secret";`.
    '')
    (lib.mkRemovedOptionModule [ "services" "oink" "settings" "secretApiKey" ] ''
      This option has been removed because it would make the API key world-readable.
      Use {option}`secretApiKeyFile` instead.
      If you insist on keeping the API key world-readable, you can use `oink.secretApiKeyFile = pkgs.writeText "secret-api-key" "secret";`.
    '')
  ];
  config = lib.mkIf cfg.enable {
    systemd.services.oink = {
      description = "Dynamic DNS client for Porkbun";
      after = [ "network.target" ];
      wantedBy = [ "multi-user.target" ];
      script = "${cfg.package}/bin/oink -c ${oinkConfig}";
      script =
        lib.optionalString (cfg.apiKeyFile != null) "OINK_OVERRIDE_APIKEY=\"$(cat ${cfg.apiKeyFile})\" "
        + lib.optionalString (
          cfg.secretApiKeyFile != null
        ) "OINK_OVERRIDE_SECRETAPIKEY=\"$(cat ${cfg.secretApiKeyFile})\" "
        + "${cfg.package}/bin/oink -c ${oinkConfig}";
      serviceConfig = {
        Restart = "on-failure";
        RestartSec = "10";
Loading