Commit cd816e27 authored by K900's avatar K900
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents 2930202f 109b17dc
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -74,9 +74,7 @@ in
      defaultText = lib.literalExpression "pkgs.firefox";
      relatedPackages = [
        "firefox"
        "firefox-beta-bin"
        "firefox-bin"
        "firefox-devedition-bin"
        "firefox-esr"
      ];
    };
+0 −2477

File deleted.

Preview size limit exceeded, changes collapsed.

+3 −10
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@
  pciutils,
  pipewire,
  adwaita-icon-theme,
  channel,
  generated,
  writeScript,
  writeText,
@@ -34,8 +33,7 @@ let

  inherit (generated) version sources;

  binaryName =
    if (channel == "release" || stdenv.hostPlatform.isDarwin) then "firefox" else "firefox-${channel}";
  binaryName = "firefox";

  mozillaPlatforms = {
    i686-linux = "linux-i686";
@@ -68,7 +66,7 @@ let

  source = lib.findFirst (sourceMatches mozLocale) defaultSource sources;

  pname = "firefox-${channel}-bin-unwrapped";
  pname = "firefox-bin-unwrapped";
in

stdenv.mkDerivation {
@@ -144,7 +142,6 @@ stdenv.mkDerivation {
    updateScript = import ./update.nix {
      inherit
        pname
        channel
        lib
        writeScript
        xidel
@@ -155,11 +152,7 @@ stdenv.mkDerivation {
        curl
        runtimeShell
        ;
      baseUrl =
        if channel == "developer-edition" then
          "https://archive.mozilla.org/pub/devedition/releases/"
        else
          "https://archive.mozilla.org/pub/firefox/releases/";
      baseUrl = "https://archive.mozilla.org/pub/firefox/releases/";
    };
  };

+0 −2477

File deleted.

Preview size limit exceeded, changes collapsed.

+2 −2
Original line number Diff line number Diff line
@@ -46,14 +46,14 @@

stdenv.mkDerivation (finalAttrs: {
  pname = "telegram-desktop-unwrapped";
  version = "5.15.3";
  version = "5.15.4";

  src = fetchFromGitHub {
    owner = "telegramdesktop";
    repo = "tdesktop";
    rev = "v${finalAttrs.version}";
    fetchSubmodules = true;
    hash = "sha256-ATGzh9zJezIOZ3uSm3rIV+KQ4XFWJvf5NaJ0ptjzYGc=";
    hash = "sha256-C7mUV/Jc0OJnVXxRGVx/l2T7APOsY05t5MLW8laIwnA=";
  };

  postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
Loading