Merge master into staging-next

maintainers/maintainer-list.nix

@@ -4179,6 +4179,12 @@
     githubId = 69784758;
     matrix = "@clot27:matrix.org";
   };
+  cloudripper = {
+    email = "[email protected]";
+    github = "cloudripper";
+    githubId = 70971768;
+    name = "cloudripper";
+  };
   clr-cera = {
     email = "[email protected]";
     github = "clr-cera";
@@ -5168,6 +5174,12 @@
     github = "DeclanRixon";
     githubId = 57464835;
   };
+  deeengan = {
+    github = "deeengan";
+    githubId = 87693324;
+    name = "Dee Engan";
+    keys = [ { fingerprint = "9C24 79F5 F0CE 48F4 00EE  4A5B B8ED 46EB 468B F72D"; } ];
+  };
   deejayem = {
     email = "[email protected]";
     github = "deejayem";
@@ -11920,6 +11932,12 @@
     github = "krzaczek";
     githubId = 5773701;
   };
+  KSJ2000 = {
+    email = "[email protected]";
+    name = "KSJ2000";
+    github = "KSJ2000";
+    githubId = 184105270;
+  };
   ktf = {
     email = "[email protected]";
     github = "ktf";
@@ -14378,12 +14396,6 @@
     githubId = 5378535;
     name = "Milo Gertjejansen";
   };
-  milran = {
-    email = "[email protected]";
-    github = "wattmto";
-    githubId = 93639059;
-    name = "Milran Mike";
-  };
   mimame = {
     email = "[email protected]";
     github = "mimame";
@@ -19624,6 +19636,13 @@
     githubId = 5104601;
     name = "schnusch";
   };
+  schrobingus = {
+    email = "[email protected]";
+    name = "Brent Monning";
+    github = "schrobingus";
+    githubId = 72168352;
+    matrix = "@schrobingus:matrix.org";
+  };
   Schweber = {
     github = "Schweber";
     githubId = 64630479;
@@ -23360,6 +23379,12 @@
     github = "water-sucks";
     githubId = 68445574;
   };
+  wattmto = {
+    email = "[email protected]";
+    github = "wattmto";
+    githubId = 93639059;
+    name = "wattmto";
+  };
   waynr = {
     name = "Wayne Warren";
     email = "[email protected]";

nixos/modules/services/mail/protonmail-bridge.nix

@@ -18,7 +18,7 @@ in
       type = lib.types.listOf lib.types.path;
       default = [ ];
       example = lib.literalExpression "with pkgs; [ pass gnome-keyring ]";
-      description = "List of derivations to put in protonmail-bride's path.";
+      description = "List of derivations to put in protonmail-bridge's path.";
     };
 
     logLevel = lib.mkOption {

pkgs/applications/video/gpac/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cctools, pkg-config, Carbon, zlib }:
+{ lib, stdenv, fetchFromGitHub, cctools, pkg-config, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "gpac";
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     zlib
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    Carbon
   ];
 
   enableParallelBuilding = true;

pkgs/by-name/al/alist/package.nix

@@ -0,0 +1,109 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  fetchurl,
+  fuse,
+  stdenv,
+  installShellFiles,
+  versionCheckHook,
+}:
+buildGoModule rec {
+  pname = "alist";
+  version = "3.38.0";
+
+  src = fetchFromGitHub {
+    owner = "AlistGo";
+    repo = "alist";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-HF5T/TZXiyT186qZyzz+m0K9ajF1wk8YAZljcq5ccWM=";
+    # populate values that require us to use git. By doing this in postFetch we
+    # can delete .git afterwards and maintain better reproducibility of the src.
+    leaveDotGit = true;
+    postFetch = ''
+      cd "$out"
+      git rev-parse HEAD > $out/COMMIT
+      # '0000-00-00T00:00:00Z'
+      date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH
+      find "$out" -name .git -print0 | xargs -0 rm -rf
+    '';
+  };
+  web = fetchurl {
+    url = "https://github.com/AlistGo/alist-web/releases/download/${version}/dist.tar.gz";
+    hash = "sha256-jHbWhjvHfgtdocuuELbOwrMzL8tOQfBVdH9MxasEwGo=";
+  };
+
+  proxyVendor = true;
+  vendorHash = "sha256-Q5E86bNedXOqMKS3WrXicWg27vnjyGao0nE34Ws2l9E=";
+
+  buildInputs = [ fuse ];
+
+  tags = [ "jsoniter" ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X \"github.com/alist-org/alist/v3/internal/conf.GitAuthor=Xhofe <[email protected]>\""
+    "-X github.com/alist-org/alist/v3/internal/conf.Version=${version}"
+    "-X github.com/alist-org/alist/v3/internal/conf.WebVersion=${version}"
+  ];
+
+  preConfigure = ''
+    # use matched web files
+    rm -rf public/dist
+    tar -xzf ${web}
+    mv -f dist public
+  '';
+
+  preBuild = ''
+    ldflags+=" -X \"github.com/alist-org/alist/v3/internal/conf.GoVersion=$(go version | sed 's/go version //')\""
+    ldflags+=" -X \"github.com/alist-org/alist/v3/internal/conf.BuiltAt=$(cat SOURCE_DATE_EPOCH)\""
+    ldflags+=" -X github.com/alist-org/alist/v3/internal/conf.GitCommit=$(cat COMMIT)"
+  '';
+
+  checkFlags =
+    let
+      # Skip tests that require network access
+      skippedTests = [
+        "TestHTTPAll"
+        "TestWebsocketAll"
+        "TestWebsocketCaller"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd alist \
+      --bash <($out/bin/alist completion bash) \
+      --fish <($out/bin/alist completion fish) \
+      --zsh <($out/bin/alist completion zsh)
+  '';
+
+  doInstallCheck = true;
+
+  versionCheckProgramArg = "version";
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  meta = {
+    description = "File list/WebDAV program that supports multiple storages";
+    homepage = "https://github.com/alist-org/alist";
+    changelog = "https://github.com/alist-org/alist/releases/tag/v${version}";
+    license = with lib.licenses; [
+      agpl3Only
+      # alist-web
+      mit
+    ];
+    maintainers = with lib.maintainers; [ moraxyc ];
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      # alist-web
+      binaryBytecode
+    ];
+    mainProgram = "alist";
+  };
+}

pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch

@@ -0,0 +1,13 @@
+diff --git a/apps/desktop/src/platform/main/biometric/biometric.unix.main.ts b/apps/desktop/src/platform/main/biometric/biometric.unix.main.ts
+index e2428d9d12..de4e9e1e62 100644
+--- a/apps/desktop/src/platform/main/biometric/biometric.unix.main.ts
++++ b/apps/desktop/src/platform/main/biometric/biometric.unix.main.ts
+@@ -109,7 +109,7 @@ export default class BiometricUnixMain implements OsBiometricService {
+     // The user needs to manually set up the polkit policy outside of the sandbox
+     // since we allow access to polkit via dbus for the sandboxed clients, the authentication works from
+     // the sandbox, once the policy is set up outside of the sandbox.
+-    return isLinux() && !isSnapStore() && !isFlatpak();
++    return false;
+   }
+
+   async osBiometricsSetup(): Promise<void> {

pkgs/by-name/bi/bitwarden-desktop/package.nix

@@ -46,11 +46,15 @@ in buildNpmPackage rec {
 
   patches = [
     ./electron-builder-package-lock.patch
+    ./dont-auto-setup-biometrics.patch
+    ./set-exe-path.patch # ensures `app.getPath("exe")` returns our wrapper, not ${electron}/bin/electron
   ];
 
   postPatch = ''
     # remove code under unfree license
     rm -r bitwarden_license
+
+    substituteInPlace apps/desktop/src/main.ts --replace-fail '%%exePath%%' "$out/bin/bitwarden"
   '';
 
   nodejs = nodejs_20;
@@ -174,6 +178,13 @@ in buildNpmPackage rec {
       --set-default ELECTRON_IS_DEV 0 \
       --inherit-argv0
 
+    # Extract the polkit policy file from the multiline string in the source code.
+    # This may break in the future but its better than copy-pasting it manually.
+    mkdir -p $out/share/polkit-1/actions/
+    pushd apps/desktop/src/platform/main/biometric
+    awk '/const polkitPolicy = `/{gsub(/^.*`/, ""); print; str=1; next} str{if (/`;/) str=0; gsub(/`;/, ""); print}' biometric.unix.main.ts > $out/share/polkit-1/actions/com.bitwarden.Bitwarden.policy
+    popd
+
     pushd apps/desktop/resources/icons
     for icon in *.png; do
       dir=$out/share/icons/hicolor/"''${icon%.png}"/apps

pkgs/by-name/bi/bitwarden-desktop/set-exe-path.patch

@@ -0,0 +1,13 @@
+diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
+index 86d07440a7..be9fa6b4ab 100644
+--- a/apps/desktop/src/main.ts
++++ b/apps/desktop/src/main.ts
+@@ -80,6 +80,8 @@ export class Main {
+       appDataPath = path.join(process.env.SNAP_USER_DATA, "appdata");
+     }
+
++    app.setPath("exe", "%%exePath%%");
++
+     app.on("ready", () => {
+       // on ready stuff...
+     });