From 217e63bbf7381455a0a5b92ed7c38e471eef179a Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Mon, 26 Oct 2020 14:09:53 -0400 Subject: [PATCH] remove hardcodes from "channel" script --- modules/cli.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/cli.nix b/modules/cli.nix index 75567d1..76a551b 100644 --- a/modules/cli.nix +++ b/modules/cli.nix @@ -47,9 +47,13 @@ '') (writeShellScriptBin "channel" '' - echo "$(curl --silent -L https://channels.nixos.org/nixos-20.09/git-revision)" nixos-20.09 - echo "$(cat /nix/var/nix/profiles/per-user/root/channels/nixos/.git-revision)" nixos local - echo "$(curl --silent -L https://channels.nixos.org/nixos-unstable/git-revision)" nixos-unstable + nixos="/nix/var/nix/profiles/per-user/root/channels/nixos" + [[ "$(<$nixos/.version-suffix)" =~ ^pre ]] && + channel="unstable" || + channel="$(<$nixos/.version)" + echo "nixos-$channel" + echo "$(<$nixos/.git-revision) current local" + echo "$(curl --silent -L "https://channels.nixos.org/nixos-$channel/git-revision") latest available" '') ];