freun-dev: drop duplicated unstable overlay and nix settings #17
Loading…
Reference in a new issue
No description provided.
Delete branch "fix/dedupe-unstable-overlay"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
freun-dev.nix defines its own unstable overlay and its own experimental-features/auto-optimise-store settings even though it imports the nixpkgs module (which provides the overlay). Remove the duplicate overlay and restated settings; keep allowUnfree and host-specific min-free/max-free/trusted-users. Verified nix eval of freun-dev toplevel succeeds.
6ce55be8f5c2f03b6230c2f03b6230405c51bf01405c51bf01d33be59b19d33be59b19c91f4ee4bac91f4ee4bad0e71a0fe9Rebased onto main after the hermes-fallback conflict. Main's
nix.settingsform was kept and only the duplicatedexperimental-features/auto-optimise-store(vianixos.nix) and the duplicatedunstableoverlay (vianixos.nixpkgs) are dropped — the PR's original delta, now conflict-free.Verified:
nix evalof thefreun-devtoplevel drvPath succeeds.d0e71a0fe9495f10230f495f10230f0c1f84083c0c1f84083c0aeed26d680aeed26d68325a63607b325a63607b335ffa1eb4View command line instructions
Manual merge helper
Use this merge commit message when completing the merge manually.
Checkout
From your project repository, check out a new branch and test the changes.