From 3c37650d960384db881a33a4b491416bd41cae17 Mon Sep 17 00:00:00 2001
From: Jens Nolte <jens@nightmarestudio.de>
Date: Sun, 19 Jan 2020 02:32:49 +0100
Subject: [PATCH] Fix default channel
---
nixos/default.nix | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/nixos/default.nix b/nixos/default.nix
index 471adb4..6b21845 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -5,15 +5,18 @@
with builtins;
let
- defaultChannel = (import channels/nixos-unstable);
+ # defaultChannel :: path (channel)
+ defaultChannel = loadChannel "nixos-unstable";
# helpers :: { *: ? }
helpers = import ./helpers.nix;
# channelsDir :: path
channelsDir = ./channels;
- # allChannels :: { *: path }
- allChannels = with helpers; keysToAttrs (channelname: import (channelsDir + "/${channelname}") channelname) (readFilterDir (filterAnd [(not filterDirHidden) filterDirDirs]) channelsDir);
+ # loadChannel :: string -> path (channel)
+ loadChannel = name: import (channelsDir + "/${name}") name;
+ # allChannels :: { *: path (channel) }
+ allChannels = with helpers; keysToAttrs loadChannel (readFilterDir (filterAnd [(not filterDirHidden) filterDirDirs]) channelsDir);
# getMachineChannel :: string -> path
getMachineChannel = { name, path }:
let
--
GitLab