Skip to content

Comments

switch-to-configuration-ng: remove nested src directories#490861

Merged
jmbaur merged 1 commit intoNixOS:staging-nixosfrom
jmbaur:jared/stc-remove-nested-src
Feb 22, 2026
Merged

switch-to-configuration-ng: remove nested src directories#490861
jmbaur merged 1 commit intoNixOS:staging-nixosfrom
jmbaur:jared/stc-remove-nested-src

Conversation

@jmbaur
Copy link
Contributor

@jmbaur jmbaur commented Feb 15, 2026

This was originally introduced when we ran into lib.fileset issues, but we can use builtins.filterSource instead, like nixos-firewall-tool does.

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

@jmbaur jmbaur requested a review from K900 February 15, 2026 23:28
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 2.status: merge-bot eligible This PR can be merged by commenting "@NixOS/nixpkgs-merge-bot merge". 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS labels Feb 15, 2026
@jmbaur jmbaur requested review from a team and arianvp February 21, 2026 06:54
@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 21, 2026
Copy link
Contributor

@ElvishJerricco ElvishJerricco left a comment

Choose a reason for hiding this comment

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

Huh, I thought filterSource had the same problem with chroot stores / the installer tests that filesets had; but given that the commit introducing the use of filterSource was written to fix the problem with the installer tests, I guess that's wrong and filterSource is actually fine: f665268

@ElvishJerricco
Copy link
Contributor

Oh, this needs to target staging-nixos

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Feb 21, 2026
This was originally introduced when we ran into lib.fileset issues, but
we can use builtins.filterSource instead, like `nixos-firewall-tool`
does.
@jmbaur jmbaur force-pushed the jared/stc-remove-nested-src branch from 5d6a3bc to db6ca70 Compare February 22, 2026 00:29
@jmbaur jmbaur changed the base branch from master to staging-nixos February 22, 2026 00:29
github-actions[bot]

This comment was marked as outdated.

@nixpkgs-ci nixpkgs-ci bot closed this Feb 22, 2026
@nixpkgs-ci nixpkgs-ci bot reopened this Feb 22, 2026
@jmbaur
Copy link
Contributor Author

jmbaur commented Feb 22, 2026

Oh, this needs to target staging-nixos

ah thanks, good catch

@github-actions github-actions bot dismissed their stale review February 22, 2026 00:30

Review dismissed automatically

@jmbaur jmbaur added this pull request to the merge queue Feb 22, 2026
@nixpkgs-ci nixpkgs-ci bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 22, 2026
Merged via the queue into NixOS:staging-nixos with commit 717b68d Feb 22, 2026
37 of 46 checks passed
@jmbaur jmbaur deleted the jared/stc-remove-nested-src branch February 22, 2026 00:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2.status: merge-bot eligible This PR can be merged by commenting "@NixOS/nixpkgs-merge-bot merge". 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants