Merge branch 'staging' into 'master'

Staging

See merge request steveeJ/infra!15
This commit is contained in:
steveej 2019-03-20 18:47:23 +00:00
commit 9e3d85c33c

View file

@ -1,15 +1,15 @@
{ {
channelsNixosStable = { channelsNixosStable = {
ref = "nixos-19.03"; ref = "nixos-19.03";
rev = "07e2b59812de95deeedde95fb6ba22d581d12fbc"; rev = "3574dbb9767a2af89d07aeee79cadbdeb0964f84";
}; };
channelsNixosUnstable = { channelsNixosUnstable = {
ref = "nixos-unstable"; ref = "nixos-unstable";
rev = "34aa254f9ebf5899636a9927ceefbc9df80230f4"; rev = "1222e289b5014d17884a8b1c99f220c5e3df0b14";
}; };
homeManagerModule = { homeManagerModule = {
url = "https://github.com/rycee/home-manager"; url = "https://github.com/rycee/home-manager";
ref = "master"; ref = "master";
rev = "52fdf5b7ecab93eaf2a2ee83777b73f8ee126614"; rev = "95e36dfe74b8d161c28601e33646e2d636026f83";
}; };
} }