Skip to content

nixos/nix-channnel: fix setting up the default channel again#264831

Merged
nikstur merged 1 commit intoNixOS:masterfrom
nikstur:nix-channel-fix-default-2
Nov 1, 2023
Merged

nixos/nix-channnel: fix setting up the default channel again#264831
nikstur merged 1 commit intoNixOS:masterfrom
nikstur:nix-channel-fix-default-2

Conversation

@nikstur
Copy link
Contributor

@nikstur nikstur commented Nov 1, 2023

Description of changes

Fixes the issue that I tried to fix in #264608
The previous solution was not entirely correct because it appends the default channel on each boot/switch.
Hopefully this time the behaviour is completely correctly.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@nikstur nikstur requested a review from eclairevoyant November 1, 2023 15:03
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Nov 1, 2023
@nikstur
Copy link
Contributor Author

nikstur commented Nov 1, 2023

@ofborg test activation-nix-channel

@nikstur nikstur requested a review from RaitoBezarius November 1, 2023 15:04
Copy link
Member

@RaitoBezarius RaitoBezarius left a comment

Choose a reason for hiding this comment

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

This attempt looks even better to me. :-)

@nikstur nikstur force-pushed the nix-channel-fix-default-2 branch from 2b56d32 to 7d0b5b3 Compare November 1, 2023 15:23
@ofborg ofborg bot added 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. labels Nov 1, 2023
@nikstur
Copy link
Contributor Author

nikstur commented Nov 1, 2023

@ofborg test activation-nix-channel

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/gibberish-nix-channel-being-added-to-my-list-preventing-update/34886/5

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants