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

Merge master into staging-next

parents 20454e77 0f93e3ef

pkgs/applications/misc/1password/default.nix

+7 −7
Original line number Diff line number Diff line
@@ -2,22 +2,22 @@ 


let

  inherit (stdenv.hostPlatform) system;

  fetch = srcPlatform: sha256: extension:

  fetch = srcPlatform: hash: extension:

    let

      args = {

        url = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_${srcPlatform}_v${version}.${extension}";

        inherit sha256;

        inherit hash;

      } // lib.optionalAttrs (extension == "zip") { stripRoot = false; };

    in

    if extension == "zip" then fetchzip args else fetchurl args;



  pname = "1password-cli";

  version = "2.21.0";

  version = "2.22.0";

  sources = rec {

    aarch64-linux = fetch "linux_arm64" "sha256-pXGBlduNOvxpPMd/BObHVXXGQ0ZTlIkqZ3jYyoGXnqA=" "zip";

    i686-linux = fetch "linux_386" "sha256-iePA4nzwBtAlYWybmQdV7Zvvnv+jPqrndB4aabf/JMM=" "zip";

    x86_64-linux = fetch "linux_amd64" "sha256-wevv0KYe01ZL70zL4BNti/oCcAzNJ3EO97QIU1BYQRE=" "zip";

    aarch64-darwin = fetch "apple_universal" "sha256-AViR53q1/jZtzpFZ7FaBwoZAGuXsGHfULEIuIrTqgSs=" "pkg";

    aarch64-linux = fetch "linux_arm64" "sha256-MWNbwCJ5ltAV1qmy8LPYkb6VTH0UVi2S5QEZZfpcnGM=" "zip";

    i686-linux = fetch "linux_386" "sha256-lqwEm7fCiM2WNZvlAt/HeqI2zxnal/OMbTMGvvmXkvY=" "zip";

    x86_64-linux = fetch "linux_amd64" "sha256-GfQ441a5mIgCTtxnk6L9UXodNGXek7f/jxJXWYJUb+0=" "zip";

    aarch64-darwin = fetch "apple_universal" "sha256-yF0dy4MUgvSJUremXFfxCIHcGmYrCcjofcv1sBD9qyI=" "pkg";

    x86_64-darwin = aarch64-darwin;

  };

  platforms = builtins.attrNames sources;

pkgs/applications/networking/browsers/mullvad-browser/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ let 
      ++ lib.optionals mediaSupport [ ffmpeg ]

  );



  version = "13.0";

  version = "13.0.1";



  sources = {

    x86_64-linux = fetchurl {
@@ -90,7 +90,7 @@ let 
        "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"

        "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"

      ];

      hash = "sha256-YtkGgSnQVJ9wtamDOtLROufhPJ9KizV8j5kK26iJ+ZY=";

      hash = "sha256-VYkRHWyTAAt5P7jnNuf4s2bOv36LuqcTMMKOLRGE9FQ=";

    };

  };

pkgs/applications/networking/instant-messengers/ferdium/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ let 
    aarch64-linux = "arm64";

  }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

  hash = {

    amd64-linux_hash = "sha256-Oai5z6/CE/R2rH9LBVhY7eaKpF8eIIYI+3vjJPbq+rw=";

    arm64-linux_hash = "sha256-bRJTktwnyZgCow8oRZNhTK8FgOhIcjrbESVlYfeaa8E=";

    amd64-linux_hash = "sha256-MmDU6Hn/s4IuTYBLYbz5okzHbx+dPOoKDtMXlLmZjQw=";

    arm64-linux_hash = "sha256-m8sygpqWiwWzbHe+n8hfVdYr0YpZNfg1B+/nf5QXoyg=";

  }."${arch}-linux_hash";

in mkFranzDerivation rec {

  pname = "ferdium";

  name = "Ferdium";

  version = "6.4.1";

  version = "6.5.2";

  src = fetchurl {

    url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-${arch}.deb";

    inherit hash;

pkgs/applications/networking/instant-messengers/signal-desktop/default.nix

+4 −4
Original line number Diff line number Diff line 
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {

  signal-desktop = {

    dir = "Signal";

    version = "6.34.1";

    hash = "sha256-1kffRXPQmtxIsLZVOgPXDnxUmY59q+1umy25cditRhw=";

    version = "6.36.0";

    hash = "sha256-zoeRBBu+eYWibpCUiyDOcDVKFQSRI+l1dZgUlESdUsk=";

  };

  signal-desktop-beta = {

    dir = "Signal Beta";

    version = "6.35.0-beta.2";

    hash = "sha256-TgzqKGt3ojkjq+mIu0EtqXfnnZ/xulWjiuS5/0dlwIM=";

    version = "6.36.0-beta.2";

    hash = "sha256-LOfKdyXosU0bJB35+TSszfHROPhLvMtngzy4zFeVVmI=";

  };

}

pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix

+265 −265

File changed.

Preview size limit exceeded, changes collapsed.