Skip to content

Pin {firefox,thunderbird}-unwrapped to exact nixpkgs hashes #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
booxter merged 1 commit into from
Mar 4, 2026
Merged

Pin {firefox,thunderbird}-unwrapped to exact nixpkgs hashes #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 40 additions & 6 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,16 @@
url = "github:jonas/tig";
flake = false;
};

# Pin Darwin Mozilla unwrapped builds while Hydra can time out long-running jobs
# when no output is produced (missing "silence timer" support). When that
# happens, build jobs fail and the artifacts are not cached.
# Building these packages locally/CI is too expensive, so we must stay on
# the previous cached versions until cache catches up.
# https://github.com/NixOS/infra/pull/950
# TODO: remove these inputs when the Hydra issue is fixed.
nixpkgs-firefox-unwrapped.url = "github:NixOS/nixpkgs/e3cb16bccd9facebae3ba29c6a76a4cc1b73462a";
nixpkgs-thunderbird-unwrapped.url = "github:NixOS/nixpkgs/e3cb16bccd9facebae3ba29c6a76a4cc1b73462a";
Copy link

Copilot AI Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nixpkgs-firefox-unwrapped and nixpkgs-thunderbird-unwrapped are pinned to the exact same nixpkgs revision. To reduce duplication (and future update churn), consider using a single pinned nixpkgs input (e.g. nixpkgs-mozilla-unwrapped) and sourcing both firefox-unwrapped and thunderbird-unwrapped from it.

Suggested change
nixpkgs-thunderbird-unwrapped.url = "github:NixOS/nixpkgs/e3cb16bccd9facebae3ba29c6a76a4cc1b73462a";
nixpkgs-thunderbird-unwrapped.follows = "nixpkgs-firefox-unwrapped";

Copilot uses AI. Check for mistakes.
};

outputs =
Expand Down
10 changes: 8 additions & 2 deletions overlays/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
additions = final: _prev: import ../pkgs final.pkgs;

modifications =
_final: prev:
final: prev:
let
getPkgs =
np:
Expand All @@ -19,6 +19,8 @@
pkgsRelease = getPkgs inputs.nixpkgs-25_11;
pkgsTransmission = getPkgs inputs.nixpkgs-transmission;
pkgsQuartzWm = getPkgs inputs.nixpkgs-quartz-wm;
pkgsFirefoxUnwrapped = getPkgs inputs.nixpkgs-firefox-unwrapped;
pkgsThunderbirdUnwrapped = getPkgs inputs.nixpkgs-thunderbird-unwrapped;
llmAgentsPkgs = inputs.llm-agents.packages.${prev.system};
pinnedTransmission = pkgsTransmission.transmission_4;
# Temporary Darwin firefox wrapper backport:
Expand Down Expand Up @@ -75,8 +77,12 @@
});
}
// inputs.nixpkgs.lib.optionalAttrs prev.stdenv.isDarwin {
"firefox-unwrapped" = pkgsFirefoxUnwrapped."firefox-unwrapped";
"thunderbird-unwrapped" = pkgsThunderbirdUnwrapped."thunderbird-unwrapped";

# Backport until https://github.com/NixOS/nixpkgs/pull/488112 lands in our pinned nixpkgs.
firefox = patchFirefoxDarwinWrapper prev.firefox;
firefox = patchFirefoxDarwinWrapper (prev.wrapFirefox final."firefox-unwrapped" { });
thunderbird = prev.wrapThunderbird final."thunderbird-unwrapped" { };
Comment on lines 79 to +85
Copy link

Copilot AI Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new pinning of firefox/thunderbird unwrapped is scoped to optionalAttrs prev.stdenv.isDarwin, so it only affects Darwin builds. If the intent is broader (as implied by the PR title), either apply the override unconditionally or clarify the scope (e.g., adjust the title/comment to explicitly say Darwin-only).

Copilot uses AI. Check for mistakes.

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