Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'

Conflicts:
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/pkgs/build-support/go/module.nix

6 files changed, 135 insertions, 4 deletions

diff --git a/nixpkgs/pkgs/by-name/si/silverbullet/package.nix b/nixpkgs/pkgs/by-name/si/silverbullet/package.nix
new file mode 100644
index 000000000000..4a41b3701427
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/si/silverbullet/package.nix
@@ -0,0 +1,39 @@
+{ lib
+, stdenv
+, fetchurl
+, deno
+, makeWrapper
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "silverbullet";
+  version = "0.7.7";
+
+  src = fetchurl {
+    url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet.js";
+    hash = "sha256-EhHPysliRi1bv/skS4+ljQW6qFsijmSup1+7/fVfFdg=";
+  };
+
+  dontUnpack = true;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/{bin,lib}
+    cp $src $out/lib/silverbullet.js
+    makeWrapper ${lib.getExe deno} $out/bin/silverbullet \
+        --set DENO_NO_UPDATE_CHECK "1" \
+        --add-flags "run -A --unstable-kv --unstable-worker-options ${placeholder "out"}/lib/silverbullet.js"
+    runHook postInstall
+  '';
+
+  meta = {
+    changelog = "https://github.com/silverbulletmd/silverbullet/blob/${finalAttrs.version}/website/CHANGELOG.md";
+    description = "An open-source, self-hosted, offline-capable Personal Knowledge Management (PKM) web application";
+    homepage = "https://silverbullet.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aorith ];
+    mainProgram = "silverbullet";
+    inherit (deno.meta) platforms;
+  };
+})
diff --git a/nixpkgs/pkgs/by-name/si/simde/package.nix b/nixpkgs/pkgs/by-name/si/simde/package.nix
index a16d804054fb..4892914e2fae 100644
--- a/nixpkgs/pkgs/by-name/si/simde/package.nix
+++ b/nixpkgs/pkgs/by-name/si/simde/package.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
       x86
       power
       mips
+      riscv
     ]);
   };
 }
diff --git a/nixpkgs/pkgs/by-name/si/simdutf/package.nix b/nixpkgs/pkgs/by-name/si/simdutf/package.nix
index 6c447b2d6b1f..734081ea5b47 100644
--- a/nixpkgs/pkgs/by-name/si/simdutf/package.nix
+++ b/nixpkgs/pkgs/by-name/si/simdutf/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simdutf";
-  version = "5.0.0";
+  version = "5.2.6";
 
   src = fetchFromGitHub {
     owner = "simdutf";
     repo = "simdutf";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ZCpLSMmgZSLAlVKzXFsaENnZwQAeKbNfKkj241PM26c=";
+    hash = "sha256-fbDQPHoGqbojvhsMOrg/gMMQJ8bODV/P53F05yIHcTQ=";
   };
 
   # Fix build on darwin
diff --git a/nixpkgs/pkgs/by-name/si/simplex-chat-desktop/package.nix b/nixpkgs/pkgs/by-name/si/simplex-chat-desktop/package.nix
index 1868e2669cdb..ad15cd9cb1ee 100644
--- a/nixpkgs/pkgs/by-name/si/simplex-chat-desktop/package.nix
+++ b/nixpkgs/pkgs/by-name/si/simplex-chat-desktop/package.nix
@@ -28,8 +28,6 @@ in appimageTools.wrapType2 {
     ];
 
     extraInstallCommands = ''
-      mv $out/bin/${pname}-${version} $out/bin/${pname}
-
       install --mode=444 -D ${appimageContents}/chat.simplex.app.desktop --target-directory=$out/share/applications
       substituteInPlace $out/share/applications/chat.simplex.app.desktop \
         --replace 'Exec=simplex' 'Exec=${pname}'
diff --git a/nixpkgs/pkgs/by-name/si/simplotask/package.nix b/nixpkgs/pkgs/by-name/si/simplotask/package.nix
new file mode 100644
index 000000000000..d08d53ed88c4
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/si/simplotask/package.nix
@@ -0,0 +1,37 @@
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
+
+buildGoModule rec {
+  pname = "simplotask";
+  version = "1.16.0";
+
+  src = fetchFromGitHub {
+    owner = "umputun";
+    repo = "spot";
+    rev = "v${version}";
+    hash = "sha256-VnQIg5HXZZwvYpaYDF1CIphLtE4S+1zADE1WnicXOSQ=";
+  };
+
+  vendorHash = null;
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  ldflags = [
+    "-s -w"
+    "-X main.revision=v${version}"
+  ];
+
+  doCheck = false;
+
+  postInstall = ''
+    mv $out/bin/{secrets,spot-secrets}
+    installManPage *.1
+  '';
+
+  meta = with lib; {
+    description = "A tool for effortless deployment and configuration management";
+    homepage = "https://spot.umputun.dev/";
+    maintainers = with maintainers; [ sikmir ];
+    license = licenses.mit;
+    mainProgram = "spot";
+  };
+}
diff --git a/nixpkgs/pkgs/by-name/si/single-file-cli/package.nix b/nixpkgs/pkgs/by-name/si/single-file-cli/package.nix
new file mode 100644
index 000000000000..13da0e896d15
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/si/single-file-cli/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  buildNpmPackage,
+  fetchFromGitHub,
+  chromium,
+  chromedriver,
+  python3,
+}:
+buildNpmPackage {
+  pname = "single-file-cli";
+  version = "1.1.49";
+
+  src = fetchFromGitHub {
+    owner = "gildas-lormeau";
+    repo = "single-file-cli";
+    rev = "af0f6f119edd8bf82bce3860fa55cfad869ac874";
+    hash = "sha256-5pozqrIIanoLF4eugLxPRsUaoUYJurliovFFBYO/mC4=";
+  };
+  npmDepsHash = "sha256-wiBpWw9nb/pWVGIc4Vl/IxxR5ic0LzLMMr3WxRNvYdM=";
+
+  nativeCheckInputs = [chromium chromedriver];
+  doCheck = stdenv.isLinux;
+
+  postBuild = ''
+    patchShebangs ./single-file
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+
+    ${python3}/bin/python -m http.server --bind 127.0.0.1 &
+    pid=$!
+
+    ./single-file \
+      --browser-headless \
+      --web-driver-executable-path=chromedriver \
+      --back-end=webdriver-chromium \
+      http://127.0.0.1:8000
+
+    grep -F 'Page saved with SingleFile' 'Directory listing for'*.html
+
+    kill $pid
+    wait
+
+    runHook postCheck
+  '';
+
+  meta = {
+    description = "CLI tool for saving a faithful copy of a complete web page in a single HTML file";
+    homepage = "https://github.com/gildas-lormeau/single-file-cli";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [n8henrie];
+    mainProgram = "single-file";
+  };
+}