Skip to content

Update inputs #192

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 3 commits into from
Mar 5, 2026
Merged

Update inputs #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
570cde5
nix flake update
booxter Mar 4, 2026
101e6de
bump firefox input
booxter Mar 4, 2026
7b32fc2
Remove firefox overlay for codec fix
booxter Mar 4, 2026
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
98 changes: 49 additions & 49 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.

2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
# 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-firefox-unwrapped.url = "github:NixOS/nixpkgs/5e4522be6bdf1600682a6f383434b057b2d77a37";
nixpkgs-thunderbird-unwrapped.url = "github:NixOS/nixpkgs/e3cb16bccd9facebae3ba29c6a76a4cc1b73462a";
};

Expand Down
38 changes: 3 additions & 35 deletions overlays/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,33 +23,6 @@
pkgsThunderbirdUnwrapped = getPkgs inputs.nixpkgs-thunderbird-unwrapped;
llmAgentsPkgs = inputs.llm-agents.packages.${prev.system};
pinnedTransmission = pkgsTransmission.transmission_4;
# Temporary Darwin firefox wrapper backport:
# in our pinned nixpkgs revision, wrapper logic copies only *.dylib symlinks.
# Some shared libraries are Mach-O dylibs without that suffix, which leaves them
# symlinked and breaks runtime features (e.g. Crypto API / media codecs).
# Drop this once nixpkgs PR #488112 (or equivalent) is in the pinned input.
patchFirefoxDarwinWrapper =
pkg:
pkg.overrideAttrs (old: {
buildCommand = old.buildCommand + ''
# Backport nixpkgs#488112 with otool-based dylib detection.
cd "$out/Applications/Firefox.app"

find . -type l -print0 | while IFS= read -r -d $'\0' file; do
case "$(basename "$file")" in
omni.ja)
;;
*)
otool -l "$file" 2>/dev/null | grep -q 'LC_ID_DYLIB' || continue
;;
esac

target="$(readlink -f "$file")"
rm "$file"
cp "$target" "$file"
done
'';
});
in
{
inherit (llmAgentsPkgs) codex claude-code;
Expand Down Expand Up @@ -77,16 +50,11 @@
});
}
// 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.wrapFirefox final."firefox-unwrapped" { });
thunderbird = prev.wrapThunderbird final."thunderbird-unwrapped" { };
inherit (pkgsFirefoxUnwrapped) firefox-unwrapped;
inherit (pkgsThunderbirdUnwrapped) thunderbird-unwrapped;
Comment on lines +53 to +54
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.

inherit expects valid Nix identifiers, but attribute names containing hyphens (e.g. firefox-unwrapped) are not valid identifiers and will fail to parse. Use quoted attribute names (e.g. inherit (pkgsFirefoxUnwrapped) "firefox-unwrapped";) or revert to explicit assignments like firefox-unwrapped = pkgsFirefoxUnwrapped."firefox-unwrapped"; (same for thunderbird).

Suggested change
inherit (pkgsFirefoxUnwrapped) firefox-unwrapped;
inherit (pkgsThunderbirdUnwrapped) thunderbird-unwrapped;
firefox-unwrapped = pkgsFirefoxUnwrapped."firefox-unwrapped";
thunderbird-unwrapped = pkgsThunderbirdUnwrapped."thunderbird-unwrapped";

Copilot uses AI. Check for mistakes.

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.

This change removes the previously provided firefox and thunderbird attributes on Darwin (previously wrapped via wrapFirefox/wrapThunderbird). If any downstream config expects pkgs.firefox/pkgs.thunderbird to be overridden by this overlay on Darwin, evaluation will change or break. If the intent is “stop overriding wrapped Firefox/Thunderbird”, consider explicitly documenting that behavior change here, or keep a passthrough assignment (e.g. firefox = prev.firefox; thunderbird = prev.thunderbird;) to preserve the overlay’s attribute surface while still dropping the backport.

Suggested change
# Preserve firefox and thunderbird attributes while dropping the wrapped backports.
firefox = prev.firefox;
thunderbird = prev.thunderbird;

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
xquartz = pkgsQuartzWm.xquartz;
quartz-wm = pkgsQuartzWm."quartz-wm";
inherit (pkgsQuartzWm) quartz-wm xquartz;
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.

Same parsing issue as above: quartz-wm contains a hyphen and is not a valid identifier for inherit. Quote the attribute name (inherit (pkgsQuartzWm) "quartz-wm" xquartz;) or assign explicitly (quartz-wm = pkgsQuartzWm."quartz-wm";).

Suggested change
inherit (pkgsQuartzWm) quartz-wm xquartz;
quartz-wm = pkgsQuartzWm."quartz-wm";
xquartz = pkgsQuartzWm.xquartz;

Copilot uses AI. Check for mistakes.
};
}