steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Periodic merge of staging to master #14

Merged
steveej merged 71 commits from staging into master 2019-01-18 10:53:52 +00:00
Conversation 32 Commits 71 Files changed 44 +1 -1
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 3f826b192d - Show all commits

2
nix/default.nix
View file

@ -16,7 +16,7 @@
}; };
nix_path = builtins.foldl' (sum: elem: sum +":" + builtins.concatStringsSep "=" elem) "" [ nix_path = builtins.foldl' (sum: elem: sum +":" + builtins.concatStringsSep "=" elem) "" [
[ "nixpkgs" (mkChannelSource "channelsNixosStable") ] [ "nixpkgs" (mkChannelSource "channelsNixosStable") ]
[ "nixos" (mkChannelSource "channelsNixosStable") ] [ "nixos" (mkChannelSource "channelsNixosStable" + "/nixos") ]
[ "channels-nixos-stable" (mkChannelSource "channelsNixosStable") ] [ "channels-nixos-stable" (mkChannelSource "channelsNixosStable") ]
[ "channels-nixos-unstable" (mkChannelSource "channelsNixosUnstable") ] [ "channels-nixos-unstable" (mkChannelSource "channelsNixosUnstable") ]
]; ];