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 +10 -4
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a04bc097e3 - Show all commits

10
nix/os/devices/CFB4ED74/versions.nix
View file

@ -1,4 +1,10 @@
{ {
channelsNixosStable = "7e88992a8c7b2de0bcb89182d8686b27bd93e46a"; channelsNixosStable = {
channelsNixosUnstable = "44b02b52ea6a49674f124f50009299f192ed78bb"; ref = "nixos-18.09";
rev = "c2950341d038995bf46a7b72db961bb3d3e9ac12";
};
channelsNixosUnstable = {
ref = "nixos-unstable";
rev = "44b02b52ea6a49674f124f50009299f192ed78bb";
};
} }

4
nix/os/devices/steveej-t480s-work/versions.nix
View file

@ -1,10 +1,10 @@
{ {
channelsNixosStable = { channelsNixosStable = {
ref = "nixos-18.09"; ref = "nixos-18.09";
rev = "7e88992a8c7b2de0bcb89182d8686b27bd93e46a"; rev = "c2950341d038995bf46a7b72db961bb3d3e9ac12";
}; };
channelsNixosUnstable = { channelsNixosUnstable = {
ref = "nixos-unstable"; ref = "nixos-unstable";
rev = "44b02b52ea6a49674f124f50009299f192ed78bb"; rev = "eebd1a9263716a04689a37b6537e50801d376b5e";
}; };
} }