Merge staging-next into staging

2022-09-14 12:02:01 +00:00
parent 1a239a927c 48f988bc2e
commit 2e552f28f1
24 changed files with 3310 additions and 2467 deletions
@@ -263,6 +263,13 @@
          <link linkend="opt-services.expressvpn.enable">services.expressvpn</link>.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          <link xlink:href="https://github.com/L11R/go-autoconfig">go-autoconfig</link>,
+          IMAP/SMTP autodiscover server. Available as
+          <link linkend="opt-services.go-autoconfig.enable">services.go-autoconfig</link>.
+        </para>
+      </listitem>
      <listitem>
        <para>
          <link xlink:href="https://www.grafana.com/oss/tempo/">Grafana
@@ -94,6 +94,8 @@ In addition to numerous new and upgraded packages, this release has the followin

 - [expressvpn](https://www.expressvpn.com), the CLI client for ExpressVPN. Available as [services.expressvpn](#opt-services.expressvpn.enable).

+- [go-autoconfig](https://github.com/L11R/go-autoconfig), IMAP/SMTP autodiscover server. Available as [services.go-autoconfig](#opt-services.go-autoconfig.enable).
+
 - [Grafana Tempo](https://www.grafana.com/oss/tempo/), a distributed tracing store. Available as [services.tempo](#opt-services.tempo.enable).

 - [AusweisApp2](https://www.ausweisapp.bund.de/), the authentication software for the German ID card. Available as [programs.ausweisapp](#opt-programs.ausweisapp.enable).
@@ -804,6 +804,7 @@
  ./services/networking/git-daemon.nix
  ./services/networking/globalprotect-vpn.nix
  ./services/networking/gnunet.nix
+  ./services/networking/go-autoconfig.nix
  ./services/networking/go-neb.nix
  ./services/networking/go-shadowsocks2.nix
  ./services/networking/gobgpd.nix
@@ -34,8 +34,6 @@ in
      wantedBy = [ "graphical-session.target" ];
      partOf   = [ "graphical-session.target" ];

-      path = [ pkgs.alsa-utils ];
-
      startLimitIntervalSec = 350;
      startLimitBurst = 10;
      serviceConfig = {
@@ -0,0 +1,66 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.go-autoconfig;
+  format = pkgs.formats.yaml { };
+  configFile = format.generate "config.yml" cfg.settings;
+
+in {
+  options = {
+    services.go-autoconfig = {
+
+      enable = mkEnableOption (mdDoc "IMAP/SMTP autodiscover feature for mail clients");
+
+      settings = mkOption {
+        default = { };
+        description = mdDoc ''
+          Configuration for go-autoconfig. See
+          <https://github.com/L11R/go-autoconfig/blob/master/config.yml>
+          for more information.
+        '';
+        type = types.submodule {
+          freeformType = format.type;
+        };
+        example = literalExpression ''
+          {
+            service_addr = ":1323";
+            domain = "autoconfig.example.org";
+            imap = {
+              server = "example.org";
+              port = 993;
+            };
+            smtp = {
+              server = "example.org";
+              port = 465;
+            };
+          }
+        '';
+      };
+
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    systemd = {
+      services.go-autoconfig = {
+        wantedBy = [ "multi-user.target" ];
+        description = "IMAP/SMTP autodiscover server";
+        after = [ "network.target" ];
+        serviceConfig = {
+          ExecStart = "${pkgs.go-autoconfig}/bin/go-autoconfig -config ${configFile}";
+          Restart = "on-failure";
+          WorkingDirectory = ''${pkgs.go-autoconfig}/'';
+          DynamicUser = true;
+        };
+      };
+    };
+
+  };
+
+  meta.maintainers = with lib.maintainers; [ onny ];
+
+}
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    owner = "kanboard";
    repo = "kanboard";
    rev = "v${version}";
-    sha256 = "sha256-RO8yxXn0kRXNIP6+OUdXMH1tRDX55e34r3CGPU5EHU0=";
+    sha256 = "sha256-Sr20WAJLKy/vaCw76abq8qoKWZbuVgqjlCTZom/puPU=";
  };

  dontBuild = true;
@@ -1,74 +1,74 @@
-{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome, xprintidle-ng, wrapGAppsHook, gdk-pixbuf, shared-mime-info, librsvg
+{ lib
+, buildPythonApplication
+, fetchPypi
+, alsa-utils
+, gobject-introspection
+, libappindicator-gtk3
+, libnotify
+, wlrctl
+, gtk3
+, xprintidle
+, wrapGAppsHook
+, babel
+, psutil
+, xlib
+, pygobject3
+, dbus-python
+, croniter
 }:

-let inherit (python3Packages) python buildPythonApplication fetchPypi croniter;
-
-in buildPythonApplication rec {
+buildPythonApplication rec {
  pname = "safeeyes";
  version = "2.1.3";
-  namePrefix = "";

  src = fetchPypi {
    inherit pname version;
    sha256 = "1b5w887hivmdrkm1ydbar4nmnks6grpbbpvxgf9j9s46msj03c9x";
  };

-  buildInputs = [
-    gtk3
-    gobject-introspection
-    gnome.adwaita-icon-theme
-    gnome.adwaita-icon-theme
-  ];
-
  nativeBuildInputs = [
    wrapGAppsHook
+    gobject-introspection
  ];

-  propagatedBuildInputs = with python3Packages; [
+  buildInputs = [
+    gtk3
+    libappindicator-gtk3
+    libnotify
+  ];
+
+  propagatedBuildInputs = [
    babel
    psutil
    xlib
    pygobject3
    dbus-python
    croniter
-
-    libappindicator-gtk3
-    libnotify
-    xprintidle-ng
  ];

-  # patch smartpause plugin
-  postPatch = ''
-    sed -i \
-      -e 's!xprintidle!xprintidle-ng!g' \
-      safeeyes/plugins/smartpause/plugin.py
+  # Prevent double wrapping, let the Python wrapper use the args in preFixup.
+  dontWrapGApps = true;

-    sed -i \
-      -e 's!xprintidle!xprintidle-ng!g' \
-      safeeyes/plugins/smartpause/config.json
+  postInstall = ''
+    mkdir -p $out/share/applications
+    cp -r safeeyes/platform/icons $out/share/icons/
+    cp safeeyes/platform/safeeyes.desktop $out/share/applications/safeeyes.desktop
  '';

  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
-      --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
-      --prefix XDG_DATA_DIRS : "${librsvg}/share"
-
-      # safeeyes images
-      --prefix XDG_DATA_DIRS : "$out/lib/${python.libPrefix}/site-packages/usr/share"
+    makeWrapperArgs+=(
+      "''${gappsWrapperArgs[@]}"
+      --prefix PATH : ${lib.makeBinPath [ alsa-utils wlrctl xprintidle ]}
    )
-    mkdir -p $out/share/applications
-    cp -r safeeyes/platform/icons $out/share/
-    cp safeeyes/platform/safeeyes.desktop $out/share/applications/
  '';

  doCheck = false; # no tests

-  meta = {
+  meta = with lib; {
    homepage = "http://slgobinath.github.io/SafeEyes";
    description = "Protect your eyes from eye strain using this simple and beautiful, yet extensible break reminder. A Free and Open Source Linux alternative to EyeLeo";
-    license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ srghma ];
-    platforms = lib.platforms.all;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ srghma ];
+    platforms = platforms.linux;
  };
 }
@@ -16,13 +16,13 @@

 stdenv.mkDerivation rec {
  pname = "tofi";
-  version = "0.5.0";
+  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "philj56";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-mSW6o/yvqj3nqkdA9C4waB+b+YcFcEXDPAdRHqYXXhY=";
+    sha256 = "sha256-wF9gj1VNu+ik/dq5Q0l6rNfqU9kQXyLiAQvbU1OoHdg=";
  };

  nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols ];
@@ -1,9 +1,9 @@
 {
-  "version": "1.10.12-sc.1",
-  "rev": "v1.10.12-sc.1",
-  "srcHash": "1rpfax6xx731w59a2i7v6jr17l3rnrn79d666f0cjchg36nkqqg9",
-  "webYarnHash": "0m5dnz3m68iz94siwmavzj50wxd6w6wanjsm1zhq76lgymgcbqc2",
-  "jsSdkYarnHash": "1k1jvavbqr7vcbdaxc6yqiq5254kxhywn1s2zndrfny7ap8z5c1c",
-  "reactSdkYarnHash": "0cz7pgrbysljmhpf4m0wqwqjqijxahl3wz5qhczlkj46dvq6qyxb",
-  "desktopYarnHash": "09ri87ynfgxrv22sykggiy6nlcf20qwj7zj9qq0rz3c2acr6g9mn"
+  "version": "1.11.4-sc.1",
+  "rev": "v1.11.4-sc.1",
+  "srcHash": "05h7zcgnq8xi1hs5wqhjbm173y56zyz8g9l6ii8nbkzjrggif37w",
+  "webYarnHash": "1yji94xcigz54bbhvssj2pgncw9fgal7mzw9h9bfwmny0pjh8c4p",
+  "jsSdkYarnHash": "11yaii6srq6fysipsr083g4ac3k1rxhclprj4q60xwk39fl4qfpb",
+  "reactSdkYarnHash": "0riz037rigpqybyf1jnfchzxyalajfc37l6xwdn5zb9avf730bms",
+  "desktopYarnHash": "0m0zzq2wbk7h7anjmj586089j2qgsd5cj99rmi2hmsmssq63fmwk"
 }
@@ -116,12 +116,12 @@ stdenv.mkDerivation rec {

  passthru.updateScript = ./update.sh;

-  meta = {
+  meta = with lib; {
    description = "Matrix client / Element Desktop fork";
    homepage = "https://schildi.chat/";
    changelog = "https://github.com/SchildiChat/schildichat-desktop/releases";
-    maintainers = lib.teams.matrix.members ++ [ lib.maintainers.kloenk ];
-    license = lib.licenses.asl20;
-    platforms = lib.platforms.all;
+    maintainers = teams.matrix.members ++ (with maintainers; [ kloenk yuka ]);
+    license = licenses.asl20;
+    platforms = platforms.all;
  };
 }
@@ -84,8 +84,10 @@ in stdenv.mkDerivation rec {
    runHook preBuild

    pushd element-web
-    node scripts/copy-res.js
-    node_modules/.bin/webpack --progress --mode production
+    export VERSION=${version}
+    yarn build:res --offline
+    yarn build:module_system --offline
+    yarn build:bundle --offline
    popd

    runHook postBuild
@@ -100,12 +102,12 @@ in stdenv.mkDerivation rec {
    runHook postInstall
  '';

-  meta = {
+  meta = with lib; {
    description = "Matrix client / Element Web fork";
    homepage = "https://schildi.chat/";
    changelog = "https://github.com/SchildiChat/schildichat-desktop/releases";
-    maintainers = lib.teams.matrix.members ++ [ lib.maintainers.kloenk ];
-    license = lib.licenses.asl20;
-    platforms = lib.platforms.all;
+    maintainers = teams.matrix.members ++ (with maintainers; [ kloenk yuka ]);
+    license = licenses.asl20;
+    platforms = platforms.all;
  };
 }
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = "https://www.jbig2dec.com/";
    description = "Decoder implementation of the JBIG2 image compression format";
-    license = lib.licenses.gpl2Plus;
+    license = lib.licenses.agpl3;
    platforms = lib.platforms.unix;
  };
 }
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, perl, texinfo }:
+{ lib, stdenv, fetchurl, fetchpatch, perl, texinfo }:

 stdenv.mkDerivation rec {
  pname = "libtasn1";
@@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-FhPwrBz0hNbsDOO4wG1WJjzHJC8cI7MNgtI940WmP3o=";
  };

+  # Patch borrowed from alpine to work around a specific test failure with musl libc
+  # Upstream is patching this test in their own CI because that CI is using alpine and thus musl
+  # https://github.com/gnutls/libtasn1/commit/06e7433c4e587e2ba6df521264138585a63d07c7#diff-037ea159eb0a7cb0ac23b851e66bee30fb838ee8d0d99fa331a1ba65283d37f7R293
+  patches = lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
+    url = "https://git.alpinelinux.org/aports/plain/main/libtasn1/failed-test.patch?id=aaed9995acc1511d54d5d93e1ea3776caf4aa488";
+    sha256 = "sha256-GTfwqEelEsGtLEcBwGRfBZZz1vKXRfWXtMx/409YqX8=";
+  });
+
  outputs = [ "out" "dev" "devdoc" ];
  outputBin = "dev";

@@ -2,17 +2,15 @@

 stdenv.mkDerivation rec {
  pname = "nix-plugins";
-  version = "9.0.0";
+  version = "10.0.0";

  src = fetchFromGitHub {
    owner = "shlevy";
    repo = "nix-plugins";
    rev = version;
-    hash = "sha256-AkHsZpYM4EY8SNuF6LhxF2peOjp69ICGc3kOLkDms64=";
+    hash = "sha256-7Lo+YxpiRz0+ZLFDvYMJWWK2j0CyPDRoP1wAc+OaPJY=";
  };

-  patches = [ ./nix-2.9.patch ];
-
  nativeBuildInputs = [ cmake pkg-config ];

  buildInputs = [ nix boost ];
@@ -1,35 +0,0 @@
-diff --git a/extra-builtins.cc b/extra-builtins.cc
-index 617807a..c417cb3 100644
--- a/extra-builtins.cc
-+++ b/extra-builtins.cc
-@@ -27,7 +27,7 @@ static ExtraBuiltinsSettings extraBuiltinsSettings;
- 
- static GlobalConfig::Register rp(&extraBuiltinsSettings);
- 
-static void extraBuiltins(EvalState & state, const Pos & pos,
-+static void extraBuiltins(EvalState & state, const PosIdx pos,
-     Value ** _args, Value & v)
- {
-     static auto extraBuiltinsFile = absPath(extraBuiltinsSettings.extraBuiltinsFile);
-@@ -44,10 +44,10 @@ static void extraBuiltins(EvalState & state, const Pos & pos,
-             auto attrs = state.buildBindings(2);
- 
-             auto sExec = state.symbols.create("exec");
-            attrs.alloc(sExec).mkPrimOp(new PrimOp { .fun = prim_exec, .arity = 1, .name = sExec });
-+            attrs.alloc(sExec).mkPrimOp(new PrimOp { .fun = prim_exec, .arity = 1, .name = "exec" });
- 
-             auto sImportNative = state.symbols.create("importNative");
-            attrs.alloc(sImportNative).mkPrimOp(new PrimOp { .fun = prim_importNative, .arity = 2, .name = sImportNative });
-+            attrs.alloc(sImportNative).mkPrimOp(new PrimOp { .fun = prim_importNative, .arity = 2, .name = "importNative" });
- 
-             arg = state.allocValue();
-             arg->mkAttrs(attrs);
-@@ -64,7 +64,7 @@ static void extraBuiltins(EvalState & state, const Pos & pos,
- static RegisterPrimOp rp1("__extraBuiltins", 0,
-     extraBuiltins);
- 
-static void cflags(EvalState & state, const Pos & _pos,
-+static void cflags(EvalState & state, const PosIdx _pos,
-     Value ** _args, Value & v)
- {
-     auto attrs = state.buildBindings(3);
@@ -388,6 +388,7 @@
 , "webpack-dev-server"
 , "copy-webpack-plugin"
 , "webtorrent-cli"
+, "wrangler"
 , "wring"
 , "write-good"
 , "@yaegassy/coc-nginx"
@@ -550,6 +550,16 @@ final: prev: {
    buildInputs = [ final.node-gyp-build ];
  };

+  wrangler = prev.wrangler.override (oldAttrs: {
+    dontNpmInstall = true;
+    nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
+    postInstall = ''
+      makeWrapper "$out/lib/node_modules/wrangler/bin/wrangler.js" "$out/bin/wrangler" \
+        --inherit-argv0
+    '';
+    meta = oldAttrs.meta // { broken = before "16.13"; };
+  });
+
  yaml-language-server = prev.yaml-language-server.override {
    nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
    postInstall = ''
@@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "ghapi";
-  version = "1.0.1";
+  version = "1.0.3";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "fastai";
    repo = "ghapi";
    rev = "refs/tags/${version}";
-    sha256 = "sha256-BbgI9SS5NqYCbcT3F+jximVILF2LlyeQyEdR84L6JIc=";
+    sha256 = "sha256-nH3OciLhet4620WAEmm8mUAmlnpniyIsF2oIzqbZ7FI=";
  };

  propagatedBuildInputs = [
@@ -7,7 +7,7 @@

 buildPythonPackage rec {
  pname = "ropgadget";
-  version = "7.0";
+  version = "7.1";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
    owner = "JonathanSalwan";
    repo = "ROPgadget";
    rev = "refs/tags/v${version}";
-    hash = "sha256-7pGPi1efgxLoxoiqtxzfcSWuNw0otAVgamEzs8stBtc=";
+    hash = "sha256-eVRQQ8VmjT8wTpiTK2Emr1tEpSwFJPbMc1fa2Zh3mT0=";
  };

  propagatedBuildInputs = [
@@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec {

  src = fetchFromGitHub {
    owner = "cloudflare";
-    repo = pname;
+    repo = "wrangler";
    rev = "v${version}";
    sha256 = "sha256-HnenF3X/6tvzwlbuOiQAvB76GrdRsqETG+3fp1fx334=";
  };
@@ -0,0 +1,29 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+}:
+
+buildGoModule rec {
+  pname = "go-autoconfig";
+  version = "unstable-2022-08-03";
+
+  src = fetchFromGitHub {
+    owner = "L11R";
+    repo = pname;
+    rev = "b1b182202da82cc881dccd715564853395d4f76a";
+    sha256 = "sha256-Rbg6Ghp5NdcLSLSIhwwFFMKmZPWsboDyHCG6ePqSSZA=";
+  };
+
+  vendorSha256 = "sha256-pI2iucrt7XLLZNOz364kOEulXxPdvJp92OewqnkQEO4=";
+
+  postInstall = ''
+    cp -r templates $out/
+  '';
+
+  meta = with lib; {
+    description = "IMAP/SMTP autodiscover feature for Thunderbird, Apple Mail and Microsoft Outlook";
+    homepage = "https://github.com/L11R/go-autoconfig";
+    license = licenses.mit;
+    maintainers = with maintainers; [ onny ];
+  };
+}
@@ -5936,7 +5936,7 @@ with pkgs;

  schildichat-desktop = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-desktop.nix {
    inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
-    electron = electron_17;
+    electron = electron_20;
  };
  schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" ''
    #!/bin/sh
@@ -6011,7 +6011,9 @@ with pkgs;
    inherit (darwin.apple_sdk.frameworks) Security;
  };

-  wrangler = callPackage ../development/tools/wrangler {
+  inherit (nodePackages_latest) wrangler;
+
+  wrangler_1 = callPackage ../development/tools/wrangler_1 {
    inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security;
  };

@@ -10765,7 +10767,7 @@ with pkgs;

  safe-rm = callPackage ../tools/system/safe-rm { };

-  safeeyes = callPackage ../applications/misc/safeeyes { };
+  safeeyes = with python3.pkgs; toPythonApplication safeeyes;

  sahel-fonts = callPackage ../data/fonts/sahel-fonts { };

@@ -22856,6 +22858,8 @@ with pkgs;

  nats-server = callPackage ../servers/nats-server { };

+  go-autoconfig = callPackage ../servers/go-autoconfig { };
+
  go-camo = callPackage ../servers/http/go-camo { };

  gofish = callPackage ../servers/gopher/gofish { };
@@ -9784,6 +9784,8 @@ in {

  safe = callPackage ../development/python-modules/safe { };

+  safeeyes = callPackage ../applications/misc/safeeyes { };
+
  safeio = callPackage ../development/python-modules/safeio { };

  safety = callPackage ../development/python-modules/safety { };