Skip to content

Commit f926979

Browse files
committed
Pin {firefox,thunderbird}-unwrapped to exact nixpkgs hashes
1 parent 71c52aa commit f926979

File tree

3 files changed

+52
-2
lines changed

3 files changed

+52
-2
lines changed

flake.lock

Lines changed: 34 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,16 @@
6161
url = "github:jonas/tig";
6262
flake = false;
6363
};
64+
65+
# Pin Darwin Mozilla unwrapped builds while Hydra can time out long-running jobs
66+
# when no output is produced (missing "silence timer" support). When that
67+
# happens, build jobs fail and the artifacts are not cached.
68+
# Building these packages locally/CI is too expensive, so we must stay on
69+
# the previous cached versions until cache catches up.
70+
# https://github.com/NixOS/infra/pull/950
71+
# TODO: remove these inputs when the Hydra issue is fixed.
72+
nixpkgs-firefox-unwrapped.url = "github:NixOS/nixpkgs/e3cb16bccd9facebae3ba29c6a76a4cc1b73462a";
73+
nixpkgs-thunderbird-unwrapped.url = "github:NixOS/nixpkgs/e3cb16bccd9facebae3ba29c6a76a4cc1b73462a";
6474
};
6575

6676
outputs =

overlays/default.nix

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
additions = final: _prev: import ../pkgs final.pkgs;
44

55
modifications =
6-
_final: prev:
6+
final: prev:
77
let
88
getPkgs =
99
np:
@@ -18,6 +18,8 @@
1818
pkgsLldb = getPkgs inputs.debugserver;
1919
pkgsRelease = getPkgs inputs.nixpkgs-25_11;
2020
pkgsQuartzWm = getPkgs inputs.nixpkgs-quartz-wm;
21+
pkgsFirefoxUnwrapped = getPkgs inputs.nixpkgs-firefox-unwrapped;
22+
pkgsThunderbirdUnwrapped = getPkgs inputs.nixpkgs-thunderbird-unwrapped;
2123
llmAgentsPkgs = inputs.llm-agents.packages.${prev.system};
2224
releaseTransmission =
2325
if prev.lib.strings.hasPrefix "4.0." pkgsRelease.transmission_4.version then
@@ -78,8 +80,12 @@
7880
});
7981
}
8082
// inputs.nixpkgs.lib.optionalAttrs prev.stdenv.isDarwin {
83+
"firefox-unwrapped" = pkgsFirefoxUnwrapped."firefox-unwrapped";
84+
"thunderbird-unwrapped" = pkgsThunderbirdUnwrapped."thunderbird-unwrapped";
85+
8186
# Backport until https://github.com/NixOS/nixpkgs/pull/488112 lands in our pinned nixpkgs.
82-
firefox = patchFirefoxDarwinWrapper prev.firefox;
87+
firefox = patchFirefoxDarwinWrapper (prev.wrapFirefox final."firefox-unwrapped" { });
88+
thunderbird = prev.wrapThunderbird final."thunderbird-unwrapped" { };
8389

8490
# Pull XQuartz stack from a fork until quartz-wm changes are merged:
8591
# https://github.com/NixOS/nixpkgs/pull/491935

0 commit comments

Comments
 (0)