Unverified Commit d6721ede authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 7ae18894 8b4df30a
Loading
Loading
Loading
Loading
+31 −6
Original line number Diff line number Diff line
@@ -4179,6 +4179,12 @@
    githubId = 69784758;
    matrix = "@clot27:matrix.org";
  };
  cloudripper = {
    email = "other.wing8806@fastmail.com";
    github = "cloudripper";
    githubId = 70971768;
    name = "cloudripper";
  };
  clr-cera = {
    email = "clrcera05@gmail.com";
    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 = "nixpkgs.bu5hq@simplelogin.com";
    github = "deejayem";
@@ -11920,6 +11932,12 @@
    github = "krzaczek";
    githubId = 5773701;
  };
  KSJ2000 = {
    email = "katsho123@outlook.com";
    name = "KSJ2000";
    github = "KSJ2000";
    githubId = 184105270;
  };
  ktf = {
    email = "giulio.eulisse@cern.ch";
    github = "ktf";
@@ -14378,12 +14396,6 @@
    githubId = 5378535;
    name = "Milo Gertjejansen";
  };
  milran = {
    email = "milranmike@protonmail.com";
    github = "wattmto";
    githubId = 93639059;
    name = "Milran Mike";
  };
  mimame = {
    email = "miguel.madrid.mencia@gmail.com";
    github = "mimame";
@@ -19624,6 +19636,13 @@
    githubId = 5104601;
    name = "schnusch";
  };
  schrobingus = {
    email = "brent.monning.jr@gmail.com";
    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 = "dev@wattmto.dev";
    github = "wattmto";
    githubId = 93639059;
    name = "wattmto";
  };
  waynr = {
    name = "Wayne Warren";
    email = "wayne.warren.s@gmail.com";
+1 −1
Original line number Diff line number Diff line
@@ -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 {
+1 −3
Original line number Diff line number Diff line
{ 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;
+109 −0
Original line number Diff line number Diff line
{
  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 <i@nn.ci>\""
    "-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";
  };
}
+13 −0
Original line number Diff line number Diff line
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> {
Loading