Merge pull request #245038 from R-VdP/fix_nix_channel

nixos/nix-channel: only try to remove the nix-channel binary if it exists
This commit is contained in:
Robert Hensing 2023-07-25 11:25:15 +02:00 committed by GitHub
commit c9f9df2f8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3,8 +3,8 @@
configuration to work.
See also
- ./nix.nix
- ./nix-flakes.nix
- ./nix.nix
- ./nix-flakes.nix
*/
{ config, lib, ... }:
let
@ -28,9 +28,9 @@ in
Whether the `nix-channel` command and state files are made available on the machine.
The following files are initialized when enabled:
- `/nix/var/nix/profiles/per-user/root/channels`
- `/root/.nix-channels`
- `$HOME/.nix-defexpr/channels` (on login)
- `/nix/var/nix/profiles/per-user/root/channels`
- `/root/.nix-channels`
- `$HOME/.nix-defexpr/channels` (on login)
Disabling this option will not remove the state files from the system.
'';
@ -48,7 +48,7 @@ in
"nixos-config=/etc/nixos/configuration.nix"
"/nix/var/nix/profiles/per-user/root/channels"
]
else [];
else [ ];
defaultText = ''
if nix.channel.enable
then [
@ -86,7 +86,7 @@ in
'';
environment.extraSetup = mkIf (!cfg.channel.enable) ''
rm $out/bin/nix-channel
rm --force $out/bin/nix-channel
'';
# NIX_PATH has a non-empty default according to Nix docs, so we don't unset